Merge branch 'akpm' (fixes from Andrew Morton)
Merge fixes from Andrew Morton: "9 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: softdirty: keep bit when zapping file pte fs/cachefiles: add missing \n to kerror conversions genalloc: fix device node resource counter drivers/rtc/rtc-efi.c: add missing module alias mm, slab: initialize object alignment on cache creation mm: softdirty: addresses before VMAs in PTE holes aren't softdirty ocfs2/dlm: do not get resource spinlock if lockres is new nilfs2: fix data loss with mmap() ocfs2: free vol_label in ocfs2_delete_osb()
No related branches found
No related tags found
Showing
- drivers/rtc/rtc-efi.c 1 addition, 0 deletionsdrivers/rtc/rtc-efi.c
- fs/cachefiles/bind.c 4 additions, 4 deletionsfs/cachefiles/bind.c
- fs/cachefiles/daemon.c 15 additions, 15 deletionsfs/cachefiles/daemon.c
- fs/cachefiles/internal.h 1 addition, 1 deletionfs/cachefiles/internal.h
- fs/cachefiles/main.c 1 addition, 1 deletionfs/cachefiles/main.c
- fs/cachefiles/namei.c 7 additions, 7 deletionsfs/cachefiles/namei.c
- fs/cachefiles/xattr.c 5 additions, 5 deletionsfs/cachefiles/xattr.c
- fs/nilfs2/inode.c 6 additions, 1 deletionfs/nilfs2/inode.c
- fs/ocfs2/dlm/dlmmaster.c 10 additions, 8 deletionsfs/ocfs2/dlm/dlmmaster.c
- fs/ocfs2/super.c 1 addition, 0 deletionsfs/ocfs2/super.c
- fs/proc/task_mmu.c 18 additions, 9 deletionsfs/proc/task_mmu.c
- lib/genalloc.c 1 addition, 0 deletionslib/genalloc.c
- mm/memory.c 1 addition, 1 deletionmm/memory.c
- mm/slab.c 2 additions, 9 deletionsmm/slab.c
Loading
Please register or sign in to comment