Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton: "A few hotfixes and various leftovers which were awaiting other merges. Mainly movement of zram into mm/" * emailed patches fron Andrew Morton <akpm@linux-foundation.org>: (25 commits) memcg: fix mutex not unlocked on memcg_create_kmem_cache fail path Documentation/filesystems/vfs.txt: update file_operations documentation mm, oom: base root bonus on current usage mm: don't lose the SOFT_DIRTY flag on mprotect mm/slub.c: fix page->_count corruption (again) mm/mempolicy.c: fix mempolicy printing in numa_maps zram: remove zram->lock in read path and change it with mutex zram: remove workqueue for freeing removed pending slot zram: introduce zram->tb_lock zram: use atomic operation for stat zram: remove unnecessary free zram: delay pending free request in read path zram: fix race between reset and flushing pending work zsmalloc: add maintainers zram: add zram maintainers zsmalloc: add copyright zram: add copyright zram: remove old private project comment zram: promote zram from staging zsmalloc: move it under mm ...
Showing
- Documentation/blockdev/zram.txt 0 additions, 6 deletionsDocumentation/blockdev/zram.txt
- Documentation/filesystems/proc.txt 2 additions, 2 deletionsDocumentation/filesystems/proc.txt
- Documentation/filesystems/vfs.txt 2 additions, 10 deletionsDocumentation/filesystems/vfs.txt
- MAINTAINERS 16 additions, 0 deletionsMAINTAINERS
- arch/x86/include/asm/pgtable_types.h 2 additions, 1 deletionarch/x86/include/asm/pgtable_types.h
- drivers/block/Kconfig 2 additions, 0 deletionsdrivers/block/Kconfig
- drivers/block/Makefile 1 addition, 0 deletionsdrivers/block/Makefile
- drivers/block/zram/Kconfig 0 additions, 1 deletiondrivers/block/zram/Kconfig
- drivers/block/zram/Makefile 0 additions, 0 deletionsdrivers/block/zram/Makefile
- drivers/block/zram/zram_drv.c 46 additions, 82 deletionsdrivers/block/zram/zram_drv.c
- drivers/block/zram/zram_drv.h 8 additions, 24 deletionsdrivers/block/zram/zram_drv.h
- drivers/net/phy/mdio_bus.c 1 addition, 0 deletionsdrivers/net/phy/mdio_bus.c
- drivers/staging/Kconfig 0 additions, 4 deletionsdrivers/staging/Kconfig
- drivers/staging/Makefile 0 additions, 2 deletionsdrivers/staging/Makefile
- drivers/staging/zsmalloc/Kconfig 0 additions, 24 deletionsdrivers/staging/zsmalloc/Kconfig
- drivers/staging/zsmalloc/Makefile 0 additions, 3 deletionsdrivers/staging/zsmalloc/Makefile
- drivers/video/backlight/lcd.c 1 addition, 1 deletiondrivers/video/backlight/lcd.c
- include/linux/blkdev.h 1 addition, 4 deletionsinclude/linux/blkdev.h
- include/linux/bootmem.h 2 additions, 2 deletionsinclude/linux/bootmem.h
- include/linux/smp.h 5 additions, 1 deletioninclude/linux/smp.h
Loading
Please register or sign in to comment