Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "26 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits) MAINTAINERS: add Dan Streetman to zbud maintainers MAINTAINERS: add Dan Streetman to zswap maintainers mm: do not export ioremap_page_range symbol for external module mn10300: fix build error of missing fpu_save() romfs: use different way to generate fsid for BLOCK or MTD frv: add missing atomic64 operations mm, page_alloc: fix premature OOM when racing with cpuset mems update mm, page_alloc: move cpuset seqcount checking to slowpath mm, page_alloc: fix fast-path race with cpuset update or removal mm, page_alloc: fix check for NULL preferred_zone kernel/panic.c: add missing \n fbdev: color map copying bounds checking frv: add atomic64_add_unless() mm/mempolicy.c: do not put mempolicy before using its nodemask radix-tree: fix private list warnings Documentation/filesystems/proc.txt: add VmPin mm, memcg: do not retry precharge charges proc: add a schedule point in proc_pid_readdir() mm: alloc_contig: re-allow CMA to compact FS pages mm/slub.c: trace free objects at KERN_INFO ...
Showing
- Documentation/filesystems/proc.txt 3 additions, 2 deletionsDocumentation/filesystems/proc.txt
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- arch/frv/include/asm/atomic.h 34 additions, 1 deletionarch/frv/include/asm/atomic.h
- arch/mn10300/include/asm/switch_to.h 1 addition, 1 deletionarch/mn10300/include/asm/switch_to.h
- drivers/base/memory.c 2 additions, 2 deletionsdrivers/base/memory.c
- drivers/memstick/core/memstick.c 1 addition, 1 deletiondrivers/memstick/core/memstick.c
- drivers/video/fbdev/core/fbcmap.c 14 additions, 12 deletionsdrivers/video/fbdev/core/fbcmap.c
- fs/Kconfig 1 addition, 0 deletionsfs/Kconfig
- fs/dax.c 0 additions, 2 deletionsfs/dax.c
- fs/ext2/Kconfig 0 additions, 1 deletionfs/ext2/Kconfig
- fs/ext4/Kconfig 0 additions, 1 deletionfs/ext4/Kconfig
- fs/proc/base.c 2 additions, 0 deletionsfs/proc/base.c
- fs/romfs/super.c 22 additions, 1 deletionfs/romfs/super.c
- fs/userfaultfd.c 35 additions, 2 deletionsfs/userfaultfd.c
- include/linux/memory_hotplug.h 2 additions, 2 deletionsinclude/linux/memory_hotplug.h
- include/linux/mmzone.h 5 additions, 1 deletioninclude/linux/mmzone.h
- include/linux/nmi.h 1 addition, 0 deletionsinclude/linux/nmi.h
- kernel/panic.c 1 addition, 1 deletionkernel/panic.c
- kernel/watchdog.c 9 additions, 0 deletionskernel/watchdog.c
- kernel/watchdog_hld.c 3 additions, 0 deletionskernel/watchdog_hld.c
Please register or sign in to comment