Merge remote-tracking branch 'aosp/android-4.19-stable' into kernel-4.19

Conflicts:
	arch/x86/Makefile
	drivers/acpi/bus.c

diff --cc Makefile
Simple merge

diff --cc arch/x86/Makefile
index 077daf0,5f4c7c6..2cc967d
--- 1/arch/x86/Makefile
--- 2/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -61,10 -62,9 +62,13 @@@ endi
  KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
  KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
  
 +# Never want PIC in x86 kernel, prevent breakage with GCC built
 +# with nonstandard options
 +KBUILD_CFLAGS += -fno-pic
 +
+ # Intel CET isn't enabled in the kernel
+ KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
+ 
  ifeq ($(CONFIG_X86_32),y)
          BITS := 32
          UTS_MACHINE := i386

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/tools/relocs.c
Simple merge

diff --cc drivers/bluetooth/hci_h5.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/drm_ioctl.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/i2c/i2c-core-base.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/pcie.c
Simple merge

diff --cc drivers/platform/x86/intel-hid.c
Simple merge

diff --cc drivers/platform/x86/intel_punit_ipc.c
Simple merge

diff --cc drivers/platform/x86/pmc_atom.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc include/acpi/acexcep.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/commoncap.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/soc/intel/boards/bytcr_rt5640.c
index 39f2b65,186c0ee..1b07eb9
--- 1/sound/soc/intel/boards/bytcr_rt5640.c
--- 2/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@@ -433,19 -446,19 +446,31 @@@ static const struct dmi_system_id byt_r
        },
        {
                .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ARCHOS 140 CESIUM"),
+               },
+               .driver_data = (void *)(BYT_RT5640_IN1_MAP |
+                                       BYT_RT5640_JD_SRC_JD2_IN4N |
+                                       BYT_RT5640_OVCD_TH_2000UA |
+                                       BYT_RT5640_OVCD_SF_0P75 |
+                                       BYT_RT5640_SSP0_AIF1 |
+                                       BYT_RT5640_MCLK_EN),
+       },
+       {
+               .matches = {
                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
 +                      DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ME176C"),
 +              },
 +              .driver_data = (void *)(BYT_RT5640_IN1_MAP |
 +                                      BYT_RT5640_JD_SRC_JD2_IN4N |
 +                                      BYT_RT5640_OVCD_TH_2000UA |
 +                                      BYT_RT5640_OVCD_SF_0P75 |
 +                                      BYT_RT5640_SSP0_AIF1 |
 +                                      BYT_RT5640_MCLK_EN),
 +      },
 +      {
 +              .matches = {
 +                      DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
                },
                .driver_data = (void *)(BYT_RT5640_IN1_MAP |