Merge branch 'akpm' (patches from Andrew)
Merge fifth set of updates from Andrew Morton: - A few things which were awaiting merges from linux-next: - rtc - ocfs2 - misc others - Willy's "dax" feature: direct fs access to memory (mainly NV-DIMMs) which isn't backed by pageframes. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (37 commits) rtc: add driver for DS1685 family of real time clocks MAINTAINERS: add entry for Maxim PMICs on Samsung boards lib/Kconfig: use bool instead of boolean powerpc: drop _PAGE_FILE and pte_file()-related helpers ocfs2: set append dio as a ro compat feature ocfs2: wait for orphan recovery first once append O_DIRECT write crash ocfs2: complete the rest request through buffer io ocfs2: do not fallback to buffer I/O write if appending ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks ocfs2: implement ocfs2_direct_IO_write ocfs2: add orphan recovery types in ocfs2_recover_orphans ocfs2: add functions to add and remove inode in orphan dir ocfs2: prepare some interfaces used in append direct io MAINTAINERS: fix spelling mistake & remove trailing WS dax: does not work correctly with virtual aliasing caches brd: rename XIP to DAX ext4: add DAX functionality dax: add dax_zero_page_range ext2: get rid of most mentions of XIP in ext2 ext2: remove ext2_aops_xip ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/00-INDEX 3 additions, 2 deletionsDocumentation/filesystems/00-INDEX
- Documentation/filesystems/Locking 0 additions, 3 deletionsDocumentation/filesystems/Locking
- Documentation/filesystems/dax.txt 94 additions, 0 deletionsDocumentation/filesystems/dax.txt
- Documentation/filesystems/ext2.txt 3 additions, 2 deletionsDocumentation/filesystems/ext2.txt
- Documentation/filesystems/ext4.txt 4 additions, 0 deletionsDocumentation/filesystems/ext4.txt
- Documentation/filesystems/vfs.txt 0 additions, 7 deletionsDocumentation/filesystems/vfs.txt
- Documentation/filesystems/xip.txt 0 additions, 71 deletionsDocumentation/filesystems/xip.txt
- MAINTAINERS 33 additions, 1 deletionMAINTAINERS
- arch/arm/boot/dts/zynq-parallella.dts 1 addition, 1 deletionarch/arm/boot/dts/zynq-parallella.dts
- arch/powerpc/include/asm/pgtable-ppc32.h 2 additions, 7 deletionsarch/powerpc/include/asm/pgtable-ppc32.h
- arch/powerpc/include/asm/pgtable-ppc64.h 1 addition, 4 deletionsarch/powerpc/include/asm/pgtable-ppc64.h
- arch/powerpc/include/asm/pgtable.h 0 additions, 1 deletionarch/powerpc/include/asm/pgtable.h
- arch/powerpc/include/asm/pte-40x.h 0 additions, 1 deletionarch/powerpc/include/asm/pte-40x.h
- arch/powerpc/include/asm/pte-44x.h 0 additions, 5 deletionsarch/powerpc/include/asm/pte-44x.h
- arch/powerpc/include/asm/pte-8xx.h 0 additions, 1 deletionarch/powerpc/include/asm/pte-8xx.h
- arch/powerpc/include/asm/pte-book3e.h 0 additions, 1 deletionarch/powerpc/include/asm/pte-book3e.h
- arch/powerpc/include/asm/pte-fsl-booke.h 0 additions, 3 deletionsarch/powerpc/include/asm/pte-fsl-booke.h
- arch/powerpc/include/asm/pte-hash32.h 0 additions, 1 deletionarch/powerpc/include/asm/pte-hash32.h
- arch/powerpc/include/asm/pte-hash64.h 0 additions, 1 deletionarch/powerpc/include/asm/pte-hash64.h
- arch/powerpc/mm/pgtable_64.c 1 addition, 1 deletionarch/powerpc/mm/pgtable_64.c
Loading
Please register or sign in to comment