Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "9 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: fs/proc/proc_sysctl.c: Fix a NULL pointer dereference mm/page_alloc.c: fix never set ALLOC_NOFRAGMENT flag mm/page_alloc.c: avoid potential NULL pointer dereference mm, page_alloc: always use a captured page regardless of compaction result mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model lib/test_vmalloc.c: do not create cpumask_t variable on stack lib/Kconfig.debug: fix build error without CONFIG_BLOCK zram: pass down the bvec we need to read into in the work struct mm/memory_hotplug.c: drop memory device reference after find_memory_block()
Showing
- Documentation/sysctl/vm.txt 8 additions, 8 deletionsDocumentation/sysctl/vm.txt
- drivers/block/zram/zram_drv.c 3 additions, 2 deletionsdrivers/block/zram/zram_drv.c
- fs/proc/proc_sysctl.c 4 additions, 2 deletionsfs/proc/proc_sysctl.c
- lib/Kconfig.debug 1 addition, 0 deletionslib/Kconfig.debug
- lib/test_vmalloc.c 3 additions, 3 deletionslib/test_vmalloc.c
- mm/memory_hotplug.c 1 addition, 0 deletionsmm/memory_hotplug.c
- mm/page_alloc.c 19 additions, 8 deletionsmm/page_alloc.c
Loading
Please register or sign in to comment