Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "15 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: scripts/gdb: make lx-dmesg command work (reliably) mm: consider memblock reservations for deferred memory initialization sizing mm/hugetlb: report -EHWPOISON not -EFAULT when FOLL_HWPOISON is specified mlock: fix mlock count can not decrease in race condition mm/migrate: fix refcount handling when !hugepage_migration_supported() dax: fix race between colliding PMD & PTE entries mm: avoid spurious 'bad pmd' warning messages mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once pcmcia: remove left-over %Z format slub/memcg: cure the brainless abuse of sysfs attributes initramfs: fix disabling of initramfs (and its compression) mm: clarify why we want kmalloc before falling backto vmallock frv: declare jiffies to be located in the .data section include/linux/gfp.h: fix ___GFP_NOLOCKDEP value ksm: prevent crash after write_protect_page fails
Showing
- arch/frv/include/asm/timex.h 6 additions, 0 deletionsarch/frv/include/asm/timex.h
- drivers/char/pcmcia/cm4040_cs.c 3 additions, 3 deletionsdrivers/char/pcmcia/cm4040_cs.c
- fs/dax.c 23 additions, 0 deletionsfs/dax.c
- include/linux/gfp.h 1 addition, 1 deletioninclude/linux/gfp.h
- include/linux/jiffies.h 5 additions, 1 deletioninclude/linux/jiffies.h
- include/linux/memblock.h 8 additions, 0 deletionsinclude/linux/memblock.h
- include/linux/mm.h 11 additions, 0 deletionsinclude/linux/mm.h
- include/linux/mmzone.h 1 addition, 0 deletionsinclude/linux/mmzone.h
- mm/gup.c 8 additions, 12 deletionsmm/gup.c
- mm/hugetlb.c 5 additions, 0 deletionsmm/hugetlb.c
- mm/ksm.c 1 addition, 2 deletionsmm/ksm.c
- mm/memblock.c 23 additions, 0 deletionsmm/memblock.c
- mm/memory-failure.c 2 additions, 6 deletionsmm/memory-failure.c
- mm/memory.c 30 additions, 10 deletionsmm/memory.c
- mm/mlock.c 3 additions, 2 deletionsmm/mlock.c
- mm/page_alloc.c 25 additions, 12 deletionsmm/page_alloc.c
- mm/slub.c 4 additions, 2 deletionsmm/slub.c
- mm/util.c 5 additions, 2 deletionsmm/util.c
- scripts/gdb/linux/dmesg.py 5 additions, 4 deletionsscripts/gdb/linux/dmesg.py
- usr/Kconfig 1 addition, 0 deletionsusr/Kconfig
Please register or sign in to comment