Merge tag 'lsk-v4.4-17.05-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

LSK 17.05 v4.4-android

* tag 'lsk-v4.4-17.05-android': (266 commits)
  BACKPORT: mm/slab: clean up DEBUG_PAGEALLOC processing code
  Linux 4.4.70
  UPSTREAM: arm64: hibernate: Support DEBUG_PAGEALLOC
  BACKPORT: arm64: vmlinux.ld: Add mmuoff data sections and move mmuoff text into idmap
  BACKPORT: arm64: Create sections.h
  ANDROID: uid_sys_stats: defer io stats calulation for dead tasks
  ANDROID: AVB: Fix linter errors.
  ANDROID: AVB: Fix invalidate_vbmeta_submit().
  drivers: char: mem: Check for address space wraparound with mmap()
  nfsd: encoders mustn't use unitialized values in error cases
  drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
  PCI: Freeze PME scan before suspending devices
  PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms
  tracing/kprobes: Enforce kprobes teardown after testing
  osf_wait4(): fix infoleak
  genirq: Fix chained interrupt data ordering
  uwb: fix device quirk on big-endian hosts
  metag/uaccess: Check access_ok in strncpy_from_user
  metag/uaccess: Fix access_ok()
  iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings
  ...

diff --cc Makefile
Simple merge

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

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

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

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

diff --cc drivers/phy/Kconfig
Simple merge

diff --cc drivers/staging/android/lowmemorykiller.c
index e7fd1a39db657b54706fd82c57a8c9219e4380f1,606d13a1ea741c0997a5323c2bd709d7bba2a91f..c3b0faa57863a76d9ef0082e45c355a663d723eb
--- 1/drivers/staging/android/lowmemorykiller.c
--- 2/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@@ -91,10 -91,10 +91,11 @@@ static unsigned long lowmem_scan(struc
        int selected_tasksize = 0;
        short selected_oom_score_adj;
        int array_size = ARRAY_SIZE(lowmem_adj);
 -      int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;
 +      int other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages
 +                                      - global_page_state(NR_FREE_CMA_PAGES);
        int other_file = global_page_state(NR_FILE_PAGES) -
                                                global_page_state(NR_SHMEM) -
+                                               global_page_state(NR_UNEVICTABLE) -
                                                total_swapcache_pages();
  
        if (lowmem_adj_size < array_size)

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

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

diff --cc drivers/usb/gadget/function/f_mtp.c
Simple merge

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

diff --cc include/linux/genhd.h
Simple merge

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