Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "14 patches. Subsystems affected by this patch series: mm (migration, vmscan, slub, gup, memcg, hugetlbfs), mailmap, kbuild, reboot, watchdog, panic, and ocfs2" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: ocfs2: initialize ip_next_orphan panic: don't dump stack twice on warn hugetlbfs: fix anon huge page migration race mm: memcontrol: fix missing wakeup polling thread kernel/watchdog: fix watchdog_allowed_mask not used warning reboot: fix overflow parsing reboot cpu number Revert "kernel/reboot.c: convert simple_strtoul to kstrtoint" compiler.h: fix barrier_data() on clang mm/gup: use unpin_user_pages() in __gup_longterm_locked() mm/slub: fix panic in slab_alloc_node() mailmap: fix entry for Dmitry Baryshkov/Eremin-Solenikov mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit mm/compaction: stop isolation if too many pages are isolated and we have pages to migrate mm/compaction: count pages and stop correctly during page isolation
Showing
- .mailmap 4 additions, 1 deletion.mailmap
- fs/ocfs2/super.c 1 addition, 0 deletionsfs/ocfs2/super.c
- include/asm-generic/barrier.h 1 addition, 0 deletionsinclude/asm-generic/barrier.h
- include/linux/compiler-clang.h 0 additions, 6 deletionsinclude/linux/compiler-clang.h
- include/linux/compiler-gcc.h 0 additions, 19 deletionsinclude/linux/compiler-gcc.h
- include/linux/compiler.h 16 additions, 2 deletionsinclude/linux/compiler.h
- include/linux/memcontrol.h 9 additions, 2 deletionsinclude/linux/memcontrol.h
- kernel/panic.c 2 additions, 1 deletionkernel/panic.c
- kernel/reboot.c 14 additions, 14 deletionskernel/reboot.c
- kernel/watchdog.c 2 additions, 2 deletionskernel/watchdog.c
- mm/compaction.c 8 additions, 4 deletionsmm/compaction.c
- mm/gup.c 10 additions, 4 deletionsmm/gup.c
- mm/hugetlb.c 5 additions, 85 deletionsmm/hugetlb.c
- mm/memory-failure.c 17 additions, 19 deletionsmm/memory-failure.c
- mm/migrate.c 24 additions, 20 deletionsmm/migrate.c
- mm/rmap.c 1 addition, 4 deletionsmm/rmap.c
- mm/slub.c 1 addition, 1 deletionmm/slub.c
- mm/vmscan.c 3 additions, 2 deletionsmm/vmscan.c
Loading
Please register or sign in to comment