Merge tag 'v4.9.212' into khadas-vims-4.9.y

This is the 4.9.212 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
 Conflicts:
	drivers/net/phy/phy_device.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/sleep.S
index 28e7b0d0014b5221e343c1deaacfae44d0aec967,c8569390e7e7e8f39eb333de26aba62c9221c1ef..39836df6e2cfe587996049237e05926ed9852b0a
--- 1/arch/arm/kernel/sleep.S
--- 2/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@@ -138,14 -142,10 +146,15 @@@ ARM_BE8(setend be)                      @ ensure we are i
        bl      __hyp_stub_install_secondary
  #endif
        safe_svcmode_maskall r1
+ no_hyp:
        mov     r1, #0
        ALT_SMP(mrc p15, 0, r0, c0, c0, 5)
 +      ALT_SMP(and r2, r0, #1<<24)
 +      ALT_SMP(cmp r2, #0)
 +      ALT_SMP(beq 2f)
 +      ALT_SMP(lsr r0, r0, #8)
        ALT_UP_B(1f)
 +2:
        adr     r2, mpidr_hash_ptr
        ldr     r3, [r2]
        add     r2, r2, r3              @ r2 = struct mpidr_hash phys address

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-tmc-etf.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

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

diff --cc drivers/usb/phy/Kconfig
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/ext4/inline.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc scripts/recordmcount.c
Simple merge