[OnePlus 3 & 3T Cross Device Development] anupritaisno1:
Okay it turns out that there are no net changes

I diffed commit https://github.com/LineageOS/android_kernel_oneplus_msm8996/commit/682d3393adad8db58b348e7122c00ab724f23286 against https://github.com/LineageOS/android_kernel_oneplus_msm8996/commit/66e7aedaaa37f358c078109185dfca12e98cba4c
and applied the diff to https://github.com/GlassROM-devices/android_kernel_oneplus_msm8996/commit/77eb9b81483efe4b7fad1953f0154e180fc80128

This is the log of git doing it's stuff
git am -3 -sS *patch
Applying: h:x!
Using index info to reconstruct a base tree...
M arch/arm/boot/dts/qcom/15801/dsi-panel-samsung_s6e3fa3_1080p_cmd.dtsi
M arch/arm/boot/dts/qcom/15801/dsi-panel-samsung_s6e3fa5_1080p_cmd.dtsi
A arch/arm/boot/dts/qcom/15801/msm8996-camera-sensor-mtp_15801.dtsi
A arch/arm/boot/dts/qcom/15801/msm8996-camera-sensor-mtp_15811.dtsi
M arch/arm/boot/dts/qcom/15801/msm8996-mdss-panels.dtsi
M arch/arm/boot/dts/qcom/15801/msm8996-mtp.dtsi
M arch/arm/boot/dts/qcom/msm8996-v3-pmi8996-mtp_15801.dts
M arch/arm/boot/dts/qcom/msm8996pro-pmi8996-mtp_15811.dts
M arch/arm64/configs/lineageos_oneplus3_defconfig
M arch/arm64/include/asm/io.h
M drivers/clk/msm/clock-gcc-8996.c
M drivers/cpuidle/lpm-levels.c
M drivers/gpio/gpiolib.c
M drivers/gpu/msm/adreno_a5xx.c
M drivers/input/misc/Kconfig
M drivers/input/misc/fpc1020_tee.c
M drivers/input/touchscreen/Kconfig
M drivers/input/touchscreen/synaptics_driver_s1302.c
M drivers/input/touchscreen/synaptics_driver_s3320.c
M drivers/misc/qcom/qdsp6v2/audio_wmapro.c
M drivers/misc/type-c-fusb301.c
M drivers/misc/type-c-fusb301.h
M drivers/misc/type-c-ptn5150.c
M drivers/misc/type-c-tusb320.c
M drivers/misc/type-c_notifier.c
M drivers/nfc/Kconfig
M drivers/nfc/Makefile
M drivers/nfc/pn544_op/Kconfig
M drivers/nfc/pn544_op/Makefile
M drivers/nfc/pn544_op/p61.c
M drivers/nfc/pn544_op/pn544.c
M drivers/nfc/pn544_op/pn544.h
M drivers/of/base.c
M drivers/of/of_private.h
M drivers/of/resolver.c
M drivers/pci/host/pci-msm.c
M drivers/pci/pci.c
M drivers/pinctrl/qcom/pinctrl-msm.c
M drivers/pinctrl/qcom/pinctrl-msm8996.c
M drivers/power/Kconfig
M drivers/power/battery_current_limit.c
M drivers/power/bq27541_fuelgauger.c
M drivers/power/oem_external_fg.h
M drivers/power/oneplus_fastcg.c
M drivers/power/op_dash_adapter.h
M drivers/power/power_supply_sysfs.c
M drivers/power/qpnp-fg.c
M drivers/power/qpnp-smbcharger.c
M drivers/power/reset/msm-poweroff.c
M drivers/scsi/ufs/ufs.h
M drivers/soc/qcom/ipc_router_mhi_dev_xprt.c
M drivers/soc/qcom/smp2p_sleepstate.c
M drivers/soc/qcom/watchdog_v2.c
M drivers/usb/core/driver.c
M drivers/usb/core/hub.c
M drivers/usb/dwc3/dwc3-msm.c
M drivers/usb/dwc3/gadget.c
M drivers/usb/gadget/composite.c
M drivers/usb/gadget/function/f_mass_storage.c
M drivers/usb/gadget/legacy/inode.c
M drivers/usb/host/xhci.c
M drivers/video/msm/mdss/mdss_dsi.c
M drivers/video/msm/mdss/mdss_dsi.h
M drivers/video/msm/mdss/mdss_dsi_panel.c
M include/linux/gpio/driver.h
M include/linux/pinctrl/pinctrl.h
M include/linux/power_supply.h
M include/linux/qpnp/power-on.h
M include/linux/type-c_notifier.h
M include/sound/msm-dai-q6-v2.h
M include/sound/tfa98xx.h
M kernel/cpu.c
M kernel/power/process.c
M kernel/power/suspend.c
M kernel/sched/core.c
M kernel/time/hrtimer.c
M net/rmnet_data/rmnet_data_handlers.c
M net/wireless/core.h
M net/wireless/db.txt
M net/wireless/scan.c
M sound/soc/codecs/Makefile
M sound/soc/codecs/tfa9890/tfa98xx.c
M sound/soc/codecs/tfa9890/tfa_dsp.c
M sound/soc/codecs/tfa9890/tfa_dsp.h
M sound/soc/codecs/wcd-mbhc-v2.c
M sound/soc/codecs/wcd-mbhc-v2.h
M sound/soc/codecs/wcd9335.c
M sound/soc/msm/msm8996.c
M sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
M sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
M sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
M sound/soc/msm/qdsp6v2/q6adm.c
.git/rebase-apply/patch:362: trailing whitespace.

.git/rebase-apply/patch:369: trailing whitespace.

.git/rebase-apply/patch:376: trailing whitespace.

.git/rebase-apply/patch:383: trailing whitespace.

.git/rebase-apply/patch:390: trailing whitespace.

warning: squelched 70 whitespace errors
warning: 75 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging sound/soc/codecs/wcd9335.c
Auto-merging sound/soc/codecs/wcd-mbhc-v2.c
Auto-merging sound/soc/codecs/tfa9890/tfa98xx.c
Auto-merging kernel/sched/core.c
Auto-merging kernel/power/suspend.c
Auto-merging include/linux/power_supply.h
Auto-merging drivers/video/msm/mdss/mdss_dsi.c
Auto-merging drivers/usb/host/xhci.c
Auto-merging drivers/usb/gadget/legacy/inode.c
Auto-merging drivers/usb/gadget/function/f_mass_storage.c
Auto-merging drivers/usb/gadget/composite.c
Auto-merging drivers/usb/dwc3/gadget.c
Auto-merging drivers/usb/dwc3/dwc3-msm.c
Auto-merging drivers/usb/core/hub.c
Auto-merging drivers/usb/core/driver.c
Auto-merging drivers/soc/qcom/watchdog_v2.c
Auto-merging drivers/power/reset/msm-poweroff.c
Auto-merging drivers/power/qpnp-smbcharger.c
Auto-merging drivers/power/power_supply_sysfs.c
Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c
Auto-merging drivers/pci/pci.c
Auto-merging drivers/input/touchscreen/synaptics_driver_s3320.c
Auto-merging drivers/input/touchscreen/synaptics_driver_s1302.c
Auto-merging drivers/clk/msm/clock-gcc-8996.c
Auto-merging arch/arm64/configs/lineageos_oneplus3_defconfig
CONFLICT (content): Merge conflict in arch/arm64/configs/lineageos_oneplus3_defconfig
Auto-merging arch/arm/boot/dts/qcom/15801/msm8996-mtp.dtsi
Auto-merging arch/arm/boot/dts/qcom/15801/msm8996-camera-sensor-mtp-15811.dtsi
Auto-merging arch/arm/boot/dts/qcom/15801/msm8996-camera-sensor-mtp-15801.dtsi
Recorded preimage for 'arch/arm64/configs/lineageos_oneplus3_defconfig'
error: Failed to merge in the changes.
Patch failed at 0001 h:x!
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In the end I had this in my console:

In other words lineage changed nothing at all in their rebase. I don't even know why they rebased