Merge tag 'v4.9.180' into khadas-vims-4.9.y-update

This is the 4.9.180 stable release

 Conflicts:
	arch/arm64/mm/proc.S

diff --cc Makefile
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc arch/arm64/kernel/asm-offsets.c
Simple merge

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

diff --cc arch/arm64/kernel/vdso/gettimeofday.S
index c39872a,df829c4..21805e4
--- 1/arch/arm64/kernel/vdso/gettimeofday.S
--- 2/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
@@@ -307,9 -308,9 +308,9 @@@ ENTRY(__kernel_clock_getres
        cmp     w0, #CLOCK_REALTIME_COARSE
        ccmp    w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne
        b.ne    4f
-       ldr     x2, 6f
+       ldr     x2, 5f
  2:
 -      cbz     w1, 3f
 +      cbz     x1, 3f
        stp     xzr, x2, [x1]
  
  3:    /* res == NULL. */

diff --cc arch/arm64/mm/proc.S
index bf0821b,3ceec22..d7d6f66
--- 1/arch/arm64/mm/proc.S
--- 2/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@@ -64,20 -64,18 +64,21 @@@ ENTRY(cpu_do_suspend
        mrs     x2, tpidr_el0
        mrs     x3, tpidrro_el0
        mrs     x4, contextidr_el1
-       mrs     x5, cpacr_el1
-       mrs     x6, tcr_el1
-       mrs     x7, vbar_el1
-       mrs     x8, mdscr_el1
-       mrs     x9, oslsr_el1
-       mrs     x10, sctlr_el1
-       mrs     x11, tpidr_el1
-       mrs     x12, sp_el0
 -      mrs     x5, osdlr_el1
++      mrs x5, osdlr_el1
+       mrs     x6, cpacr_el1
+       mrs     x7, tcr_el1
+       mrs     x8, vbar_el1
+       mrs     x9, mdscr_el1
+       mrs     x10, oslsr_el1
+       mrs     x11, sctlr_el1
++      mrs     x12, tpidr_el1
++      mrs     x13, sp_el0
        stp     x2, x3, [x0]
-       stp     x4, xzr, [x0, #16]
-       stp     x5, x6, [x0, #32]
-       stp     x7, x8, [x0, #48]
-       stp     x9, x10, [x0, #64]
-       stp     x11, x12, [x0, #80]
 -      stp     x4, x5, [x0, #16]
 -      stp     x6, x7, [x0, #32]
 -      stp     x8, x9, [x0, #48]
 -      stp     x10, x11, [x0, #64]
++      stp x4, x5, [x0, #16]
++      stp x6, x7, [x0, #32]
++      stp x8, x9, [x0, #48]
++      stp x10, x11, [x0, #64]
++      stp     x12, x13, [x0, #80]
        ret
  ENDPROC(cpu_do_suspend)
  

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc drivers/base/power/main.c
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

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

diff --cc drivers/mmc/core/sd.c
Simple merge

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

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

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

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

diff --cc fs/char_dev.c
Simple merge

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

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