From: Linus Torvalds Date: Sat, 26 Aug 2017 01:02:27 +0000 (-0700) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Tag: MMI-PSA29.97-13-9~4918 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b3242dba9ff285962fe84d1135cafe9383d721f0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'akpm' (patches from Andrew) Merge misc fixes from Andrew Morton: "6 fixes" * emailed patches from Andrew Morton : mm/memblock.c: reversed logic in memblock_discard() fork: fix incorrect fput of ->exe_file causing use-after-free mm/madvise.c: fix freeing of locked page with MADV_FREE dax: fix deadlock due to misaligned PMD faults mm, shmem: fix handling /sys/kernel/mm/transparent_hugepage/shmem_enabled PM/hibernate: touch NMI watchdog when creating snapshot --- b3242dba9ff285962fe84d1135cafe9383d721f0