iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs/nfs
History
David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-03-06 01:20:46 -05:00
..
blocklayout
pnfs/blocklayout: Ensure disk address in block device map
2018-01-25 16:42:35 -05:00
filelayout
nfs41: do not return ENOMEM on LAYOUTUNAVAILABLE
2018-01-18 12:51:31 -05:00
flexfilelayout
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
cache_lib.c
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
cache_lib.h
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
callback_proc.c
NFSv4: Fix broken cast in nfs4_callback_recallany()
2018-02-21 16:35:50 -05:00
callback_xdr.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
callback.c
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
callback.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
client.c
nfs: fix a deadlock in nfs client initialization
2017-12-15 14:31:49 -05:00
delegation.c
nfs: convert to new i_version API
2018-01-29 06:42:21 -05:00
delegation.h
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
dir.c
Rename superblock flags (MS_xyz -> SB_xyz)
2017-11-27 13:05:09 -08:00
direct.c
NFS: commit direct writes even if they fail partially
2018-01-16 10:13:23 -05:00
dns_resolve.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
dns_resolve.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
export.c
nfs: remove unused label in nfs_encode_fh()
2018-01-16 10:12:49 -05:00
file.c
NFS: Revert "NFS: Move the flock open mode check into nfs_flock()"
2017-11-17 16:43:52 -05:00
fscache-index.c
nfs: convert to new i_version API
2018-01-29 06:42:21 -05:00
fscache.c
nfs: define nfs_inc_fscache_stats and using it as possible
2014-11-24 20:08:47 -05:00
fscache.h
NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()
2013-09-27 18:40:25 +01:00
getroot.c
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
inode.c
net: Convert nfs_net_ops
2018-02-27 11:01:35 -05:00
internal.h
Rename superblock flags (MS_xyz -> SB_xyz)
2017-11-27 13:05:09 -08:00
io.c
NFS: Fix a race between mmap() and O_DIRECT
2018-01-28 22:00:15 -05:00
iostat.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Kconfig
pnfs/blocklayout: require 64-bit sector_t
2017-08-11 14:10:13 -04:00
Makefile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mount_clnt.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
namespace.c
NFS: Use ERR_CAST() to avoid cross-structure cast
2017-05-28 10:11:47 -07:00
netns.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs2super.c
NFS: Convert v2 into a module
2012-07-30 19:06:41 -04:00
nfs2xdr.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs3_fs.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs3acl.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs3client.c
NFS: Remove unused authflavour parameter from nfs_get_client()
2016-12-01 17:46:32 -05:00
nfs3proc.c
NFS: make struct nlmclnt_fl_close_lock_ops static
2018-02-22 12:23:01 -05:00
nfs3super.c
nfsv3: introduce nfs3_set_ds_client
2015-02-03 11:06:34 -08:00
nfs3xdr.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs4_fs.h
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
nfs4client.c
nfs: system crashes after NFS4ERR_MOVED recovery
2018-02-22 12:17:42 -05:00
nfs4file.c
nfs4file: get rid of pointless include of btrfs.h
2017-12-30 00:03:39 -05:00
nfs4getroot.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs4idmap.c
NFS: reject request for id_legacy key without auxdata
2018-01-22 10:05:11 -05:00
nfs4idmap.h
NFS: Move nfs_idmap.h into fs/nfs/
2015-04-23 15:16:14 -04:00
nfs4namespace.c
nfs: Referrals should use the same proto setting as their parent
2018-01-14 23:06:30 -05:00
nfs4proc.c
NFS client updates for Linux 4.16
2018-01-30 19:03:48 -08:00
nfs4renewd.c
NFSv4: Set the connection timeout to match the lease period
2017-02-09 14:15:16 -05:00
nfs4session.c
NFSv4.1: Fix regression in callback retry handling
2016-12-01 17:21:38 -05:00
nfs4session.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs4state.c
NFSv4: always set NFS_LOCK_LOST when a lock is lost.
2018-01-14 23:06:29 -05:00
nfs4super.c
NFS: Move nfs_idmap.h into fs/nfs/
2015-04-23 15:16:14 -04:00
nfs4sysctl.c
nfs: Do not convert nfs_idmap_cache_timeout to jiffies
2018-01-18 15:10:47 -05:00
nfs4trace.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs4trace.h
NFS client updates for Linux 4.15
2017-11-17 14:18:00 -08:00
nfs4xdr.c
NFS: Fix nfsstat breakage due to LOOKUPP
2018-01-14 23:06:29 -05:00
nfs42.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs42proc.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs42xdr.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfs.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfsroot.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfstrace.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nfstrace.h
NFS client updates for Linux 4.16
2018-01-30 19:03:48 -08:00
pagelist.c
NFS: remove unused offset arg in nfs_pgio_rpcsetup
2018-01-14 23:06:29 -05:00
pnfs_dev.c
pnfs/blocklayout: handle transient devices
2018-01-14 23:06:29 -05:00
pnfs_nfs.c
fs, nfs: convert nfs4_pnfs_ds.ds_count from atomic_t to refcount_t
2017-11-17 13:47:59 -05:00
pnfs.c
nfs/pnfs: fix nfs_direct_req ref leak when i/o falls back to the mds
2018-01-14 23:06:29 -05:00
pnfs.h
pnfs/blocklayout: handle transient devices
2018-01-14 23:06:29 -05:00
proc.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
read.c
NFS: Add static NFS I/O tracepoints
2017-09-11 22:20:38 -04:00
super.c
Rename superblock flags (MS_xyz -> SB_xyz)
2017-11-27 13:05:09 -08:00
symlink.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
sysctl.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
unlink.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
write.c
NFS client updates for Linux 4.16
2018-01-30 19:03:48 -08:00