diff options
author | Tejun Heo <tj@kernel.org> | 2013-12-10 08:40:48 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-12-10 08:44:37 -0500 |
commit | 13ccb93f4127baf53961a9497780a0f52e3c24e7 (patch) | |
tree | fcfcca99d9d9c49a03d825ddaecabe0163c924eb /include/linux/nfs4.h | |
parent | bbc780f8bab52fef1784151d3c4982cb1143edd2 (diff) | |
parent | a8b14744429f90763f258ad0f69601cdcad610aa (diff) | |
download | kernel_replicant_linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.tar.gz kernel_replicant_linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.tar.bz2 kernel_replicant_linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.zip |
Merge branch 'driver-core-linus' into driver-core-next
a8b14744429f ("sysfs: give different locking key to regular and bin
files") in driver-core-linus modifies sysfs_open_file() so that it
gives out different locking classes to sysfs_open_files depending on
whether the file is bin or not. Due to the massive kernfs
reorganization in driver-core-next, this naturally causes merge
conflict in fs/sysfs/file.c.
Due to the way things are split between kernfs and sysfs in
driver-core-next, the same fix can't easily be applied to
driver-core-next. This merge simply ignores the offending commit. A
following patch will implement a separate fix for the issue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/nfs4.h')
-rw-r--r-- | include/linux/nfs4.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index c1637062c1ce..12c2cb947df5 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -413,16 +413,6 @@ enum lock_type4 { #define NFS4_VERSION 4 #define NFS4_MINOR_VERSION 0 -#if defined(CONFIG_NFS_V4_2) -#define NFS4_MAX_MINOR_VERSION 2 -#else -#if defined(CONFIG_NFS_V4_1) -#define NFS4_MAX_MINOR_VERSION 1 -#else -#define NFS4_MAX_MINOR_VERSION 0 -#endif /* CONFIG_NFS_V4_1 */ -#endif /* CONFIG_NFS_V4_2 */ - #define NFS4_DEBUG 1 /* Index of predefined Linux client operations */ |