Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc arch/arm/lib/copy_from_user.S
index 1258914,f1e34f1..cfd79f3
--- 1/arch/arm/lib/copy_from_user.S
--- 2/arch/arm/lib/copy_from_user.S
+++ b/arch/arm/lib/copy_from_user.S
@@@ -100,9 -99,8 +100,9 @@@ WEAK(arm_copy_from_user
  #include "copy_template.S"
  
  ENDPROC(arm_copy_from_user)
 +ENDPROC(__copy_from_user_std)
  
-       .pushsection .fixup,"ax"
+       .pushsection .text.fixup,"ax"
        .align 0
        copy_abort_preamble
        ldmfd   sp!, {r1, r2, r3}

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

diff --cc drivers/i2c/busses/i2c-gpio.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
Simple merge

diff --cc sound/soc/codecs/pcm512x.c
Simple merge