summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 outAlexey Dobriyan2008-10-206-267/+269
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/eric...Linus Torvalds2008-10-207-57/+156
|\
| * 9p: fix device file handlingMagnus Deininger2008-10-171-0/+1
| * 9p: eliminate depricated conv functionsEric Van Hensbergen2008-10-171-8/+12
| * 9p: rework client code to use new protocol support functionsEric Van Hensbergen2008-10-175-26/+28
| * 9p: move dirread to fs layerEric Van Hensbergen2008-10-171-16/+38
| * 9p: adjust 9p vfs write operationEric Van Hensbergen2008-10-171-7/+29
| * 9p: move readn meta-function from client to fs layerEric Van Hensbergen2008-10-174-9/+57
| * 9p: consolidate read/write functionsEric Van Hensbergen2008-10-171-2/+2
| * 9p: consolidate transport structureEric Van Hensbergen2008-10-171-1/+1
* | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-10-203-8/+21
|\ \
| * | NFS: use correct fs type for v4 submounts and referralsAndy Adamson2008-10-171-2/+2
| * | Make nfs_file_cred more robust.Neil Brown2008-10-171-2/+4
| * | NFS: Enable NFSv4 callback server to listen on AF_INET6 socketsChuck Lever2008-10-171-4/+15
| |/
* | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2008-10-2020-167/+1178
|\ \
| * | UBIFS: fix ubifs_compress commentaryGeert Uytterhoeven2008-10-191-2/+0
| * | UBIFS: amend printkArtem Bityutskiy2008-10-191-1/+1
| * | UBIFS: do not read unnecessary bytes when unpacking bitsAdrian Hunter2008-10-191-7/+38
| * | UBIFS: check buffer length when scanning for LPT nodesAdrian Hunter2008-09-301-0/+2
| * | UBIFS: correct condition to eliminate unecessary assignmentAdrian Hunter2008-09-301-1/+1
| * | UBIFS: add more debugging messages for LPTAdrian Hunter2008-09-305-13/+228
| * | UBIFS: fix bulk-read handling uptodate pagesAdrian Hunter2008-09-301-5/+11
| * | UBIFS: improve garbage collectionAdrian Hunter2008-09-301-10/+72
| * | UBIFS: allow for sync_fs when read-onlyAdrian Hunter2008-09-301-9/+10
| * | UBIFS: commit on sync_fsArtem Bityutskiy2008-09-301-0/+12
| * | UBIFS: correct comment for commit_on_unmountArtem Bityutskiy2008-09-301-6/+3
| * | UBIFS: update dbg_dump_inodeArtem Bityutskiy2008-09-301-17/+25
| * | UBIFS: fix commentaryArtem Bityutskiy2008-09-301-2/+2
| * | UBIFS: fix races in bit-fieldsArtem Bityutskiy2008-09-301-8/+9
| * | UBIFS: ensure data read beyond i_size is zeroed out correctlyAdrian Hunter2008-09-302-3/+8
| * | UBIFS: correct key comparisonAdrian Hunter2008-09-301-2/+2
| * | UBIFS: use bit-fields when possibleArtem Bityutskiy2008-09-301-13/+11
| * | UBIFS: check data CRC when in error stateArtem Bityutskiy2008-09-301-0/+1
| * | UBIFS: improve znode splitting rulesAdrian Hunter2008-09-301-21/+33
| * | UBIFS: add no_chk_data_crc mount optionAdrian Hunter2008-09-305-9/+55
| * | UBIFS: add bulk-read facilityAdrian Hunter2008-09-305-3/+626
| * | UBIFS: use an IS_ERR test rather than a NULL testJulien Brunel2008-09-301-4/+0
| * | UBIFS: inline one-line functionsArtem Bityutskiy2008-09-303-30/+27
| * | UBIFS: remove unneeded unlikely()Hirofumi Nakagawa2008-09-304-9/+9
| * | UBIFS: add a print, fix comments and more minor stuffArtem Bityutskiy2008-09-303-24/+24
* | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2008-10-208-200/+203
|\ \ \
| * | | [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flashAlexander Belyakov2008-10-182-4/+5
| * | | [JFFS2] Correct parameter names of jffs2_compress() in commentsGeert Uytterhoeven2008-10-171-2/+2
| * | | CRED: Wrap task credential accesses in the JFFS2 filesystemDavid Howells2008-09-011-2/+2
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2008-09-01146-2240/+2103
| |\ \ \
| * | | | [JFFS2] Move JFFS2 config options out of fs/KconfigAlexey Dobriyan2008-09-012-189/+189
| * | | | [JFFS2] Fill in f_fsid field in jffs2_statfs()David Woodhouse2008-08-181-0/+2
| * | | | [JFFS2] Correct symlink name too long error codeAdrian Hunter2008-08-141-1/+1
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2008-08-12135-4177/+4892
| |\ \ \ \
| * | | | | [MTD] Define and use MTD_FAIL_ADDR_UNKNOWN instead of 0xffffffffAdrian Hunter2008-08-121-2/+2