summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge branch 'devel' into linux-nextTrond Myklebust2009-12-035-72/+126
| | |\
| | | * NFS4ERR_FILE_OPEN handling in Linux/NFSNeilBrown2009-12-031-0/+7
| | | * nfs: clean up sillyrenaming in nfs_rename()Miklos Szeredi2009-12-031-7/+4
| | | * nfs: dont unhash target if renaming a directoryMiklos Szeredi2009-12-031-27/+29
| | | * nfs: fix comments in nfs_rename()Miklos Szeredi2009-12-031-7/+5
| | | * nfs: remove unnecessary check from nfs_rename()Miklos Szeredi2009-12-031-8/+2
| | | * NFSv4.1: Handle NFSv4.1 session errors in the lock recovery codeTrond Myklebust2009-12-031-0/+8
| | | * NFS: Revert default r/wsize behaviorChuck Lever2009-12-031-2/+0
| | | * NFS: Display compressed (shorthand) IPv6 in /proc/mountsChuck Lever2009-12-031-1/+1
| | | * NFS: convert proto= option to use netids rather than a protonameJeff Layton2009-12-031-13/+81
| | | * The rpc server does not require that service threads take the BKL.J. Bruce Fields2009-12-031-12/+0
| | | * NFS: BKL removal from the mount code...Trond Myklebust2009-12-031-6/+0
| | * | NFSv4: Ensure nfs4_close_context() is declared as staticTrond Myklebust2009-12-031-1/+1
| | * | NFSv4: Ensure nfs_dns_lookup() and nfs_dns_update() are declared staticTrond Myklebust2009-12-031-2/+2
| | * | NFSv4: Fix up error handling in the state manager main loop.Trond Myklebust2009-12-031-27/+21
| | * | NFSv4: Handle NFS4ERR_GRACE when recovering an expired lease.Trond Myklebust2009-12-031-7/+19
| | * | NFSv4: Ensure the state manager handles NFS4ERR_NO_GRACE correctlyTrond Myklebust2009-12-031-0/+3
| | * | NFSv4: The state manager shouldn't exit on errors that were handledTrond Myklebust2009-12-031-6/+5
| | * | NFSv4: Fix up the callers of nfs4_state_end_reclaim_rebootTrond Myklebust2009-12-031-3/+2
| | * | NFSv4: Fix a potential state manager deadlock when returning delegationsTrond Myklebust2009-12-032-15/+29
| | * | Re: acl trouble after upgrading ubuntuJ. Bruce Fields2009-12-031-1/+1
| | |/
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Linus Torvalds2009-12-143-28/+10
|\ \ \ | |/ / |/| |
| * | this_cpu: xfs_icsb_modify_counters does not need "cpu" variableChristoph Lameter2009-10-031-6/+6
| * | this_cpu: Straight transformationsChristoph Lameter2009-10-031-1/+1
| * | this_cpu: Use this_cpu operations for NFS statisticsChristoph Lameter2009-10-031-21/+3
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2009-12-121-20/+21
|\ \ \
| * \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-12-0980-1721/+2571
| |\ \ \
| * \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-11-2420-49/+121
| |\ \ \ \
| * \ \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-11-1233-198/+446
| |\ \ \ \ \
| * | | | | | Convert /proc/device-tree/ to seq_fileAlexey Dobriyan2009-10-301-20/+21
* | | | | | | Merge branch 'compat-ioctl-merge' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2009-12-111-564/+203
|\ \ \ \ \ \ \
| * | | | | | | usbdevfs: move compat_ioctl handling to devio.cArnd Bergmann2009-12-101-112/+0
| * | | | | | | lp: move compat_ioctl handling into lp.cArnd Bergmann2009-12-101-33/+0
| * | | | | | | compat_ioctl: pass compat pointer directly to handlersArnd Bergmann2009-12-101-128/+83
| * | | | | | | compat_ioctl: simplify lookup tableArnd Bergmann2009-12-101-46/+44
| * | | | | | | compat_ioctl: simplify calling of handlersArnd Bergmann2009-12-101-47/+39
| * | | | | | | compat_ioctl: inline all conversion handlersArnd Bergmann2009-12-101-54/+81
| * | | | | | | compat_ioctl: Remove BKLArnd Bergmann2009-12-101-2/+0
| * | | | | | | compat_ioctl: remove all VT ioctl handlingArnd Bergmann2009-12-101-187/+1
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2009-12-111-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | devpts_get_tty() should validate inodeSukadev Bhattiprolu2009-12-111-2/+14
| |/ / / / / / /
* | | | | | | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2009-12-1130-632/+889
|\ \ \ \ \ \ \ \
| * | | | | | | | ext3: PTR_ERR return of wrong pointer in setup_new_group_blocks()Roel Kluin2009-12-101-1/+1
| * | | | | | | | ext3: Fix data / filesystem corruption when write fails to copy dataJan Kara2009-12-101-4/+14
| * | | | | | | | ext4: Support for 64-bit quota formatJan Kara2009-12-101-6/+24
| * | | | | | | | ext3: Support for vfsv1 quota formatJan Kara2009-12-101-6/+24
| * | | | | | | | quota: Implement quota format with 64-bit space and inode limitsJan Kara2009-12-103-39/+153
| * | | | | | | | quota: Move definition of QFMT_OCFS2 to linux/quota.hJan Kara2009-12-101-4/+0
| * | | | | | | | ext2: fix comment in ext2_find_entry about return valuesJérémy Cochoy2009-12-101-2/+2
| * | | | | | | | ext3: Unify log messages in ext3Alexey Fisher2009-12-101-205/+227