Find 7 changes applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298: arch/arm/mach-msm

From LNX.LA.3.2.5-00210-8x74.0

Includes a fix of spelling errors for CONFIG_OPPO_DEVICE_INFO

Conflicts:
	arch/arm/mach-msm/acpuclock-8974.c
	arch/arm/mach-msm/acpuclock-krait.c
	arch/arm/mach-msm/clock-8974.c
	arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h
arch/arm/mach-msm/Kconfig: Add Oppo VENDOR_EDIT

With the find5 and n1, CONFIG_VENDOR_EDIT was triggered via
Kconfig/defconfig directives.  In the find7 drop, they're using
Makefile hax

CONFIG_VENDOR_EDIT is a bit of a hack to begin with, but doing it
in the Makefile is...  ugh...
Find 7 changes: drivers/nfc

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298: drivers/media/platform (camera)

minus msm_sensor.c because it needs major merge work
minus drivers/media/platform/msm/vidc/venus_hfi.c because it also needs major merge work

From LNX.LA.3.2.5-00210-8x74.0

Conflicts:
	drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c
	drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
	drivers/media/platform/msm/camera_v2/sensor/Makefile
	drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
	drivers/media/platform/msm/vidc/venus_hfi.c
Find 7 changes: drivers/input/touchscreen

Minus firmware files

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: Touchscreen firmware files

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/misc

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/platform/msm

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/leds

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/power minus qpnp-charger

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/hwmon/qpnp-adc-common.c

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: drivers/base/power

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298
Find 7 changes: arch/arm/boot

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298

Conflicts:
	arch/arm/boot/dts/dsi-panel-jdi-1080p-video.dtsi
	arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi
	arch/arm/boot/dts/msm8974-mdss-panels.dtsi
	arch/arm/boot/dts/msm8974-mdss.dtsi
	arch/arm/boot/dts/msm8974-mtp.dtsi
	arch/arm/boot/dts/msm8974.dtsi
	arch/arm/boot/dts/msm8974pro-pm8941.dtsi
	arch/arm/boot/dts/msm8974pro-pma8084-mtp.dtsi
	arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
Find 7 changes applied to AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298: former msm_sensor.c

All contents of msm_sensor.c were moved elsewhere.

DT vreg changes moved to msm_camera_dt_util.c

DT gpio changes dropped - Qcom now has their own way of marking
items that didn't have DT entries as invalid

Test functions (msm_sensor_power_down/up) removed
Find 7 changes: drivers/char/diag/diagfwd.c

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146
Find 7 changes: drivers/slimbus

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146

Conflicts:
	drivers/slimbus/slim-msm-ngd.c
	drivers/slimbus/slim-msm.h
Find 7 changes: PIC charger firmware source

These aren't actually compiled into the kernel as far as I can tell.

This lets the firmware blob header file get rebuilt with a PIC compiler

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146
Find 7 changes: drivers/mfd/wcd9xxx-core.c

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146
Find 7 changes: drivers/scsi

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146
Find 7 changes: drivers/usb

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146

Conflicts:
	drivers/usb/dwc3/dwc3-msm.c