Hi Linus,
The following changes since commit 5b5faaf6df73412af0278997db36dbcb51011d9d:
nfs4: add NFSv4 LOOKUPP handlers (2017-07-13 16:00:15 -0400)
are available in the git repository at:
git://git.linux-nfs.org/projects/anna/linux-nfs.git tags/nfs-for-4.13-2
for you to fetch changes up to 1ebf980127924c639e2b85c08468311ba1c95b70:
NFS/filelayout: Fix racy setting of fl->dsaddr in filelayout_check_deviceid() (2017-07-21 14:08:45 -0400)
----------------------------------------------------------------
Stable bugfixes:
- Fix error reporting regression
Bugfixes:
- Fix setting filelayout ds address race
- Fix subtle access bug when using ACLs
- Fix setting mnt3_counts array size
- Fix a couple of pNFS commit races
gpg claims it was able to sync my key with the keyserver, so hopefully
you're able to update it now. Have a good weekend!
Anna
----------------------------------------------------------------
Eryu Guan (1):
nfs: count correct array for mnt3_counts array size
NeilBrown (1):
net/sunrpc/xprt_sock: fix regression in connection error reporting.
Peng Tao (1):
nfs: add export operations
Steve Dickson (1):
mount: copy the port field into the cloned nfs_server structure.
Trond Myklebust (10):
NFS: Don't run wake_up_bit() when nobody is waiting...
NFS: Fix a COMMIT race in pNFS
NFS: Fix another COMMIT race in pNFS
pNFS/flexfiles: Handle expired layout segments in ff_layout_initiate_commit()
Revert commit 722f0b891198 ("pNFS: Don't send COMMITs to the DSes if...")
NFS: Refactor NFS access to kernel access mask calculation
NFSv3: Convert nfs3_proc_access() to use nfs_access_set_mask()
NFS: Store the raw NFS access mask in the inode's access cache
NFS: Be more careful about mapping file permissions
NFS/filelayout: Fix racy setting of fl->dsaddr in filelayout_check_deviceid()
fs/nfs/Makefile | 2 +-
fs/nfs/client.c | 1 +
fs/nfs/dir.c | 47 +++++++--
fs/nfs/export.c | 177 +++++++++++++++++++++++++++++++++
fs/nfs/filelayout/filelayout.c | 13 ++-
fs/nfs/flexfilelayout/flexfilelayout.c | 4 +
fs/nfs/internal.h | 2 +
fs/nfs/mount_clnt.c | 2 +-
fs/nfs/nfs3proc.c | 11 +-
fs/nfs/pagelist.c | 17 +++-
fs/nfs/pnfs_nfs.c | 24 +++--
fs/nfs/super.c | 2 +
include/linux/nfs_fs.h | 2 +-
include/linux/nfs_page.h | 2 +
net/sunrpc/xprtsock.c | 2 +
15 files changed, 272 insertions(+), 36 deletions(-)
create mode 100644 fs/nfs/export.c
On Fri, Jul 21, 2017 at 1:34 PM, Anna Schumaker
<[email protected]> wrote:
>
> gpg claims it was able to sync my key with the keyserver, so hopefully
> you're able to update it now.
I can see the updated key, yes.
However, this:
> Peng Tao (1):
> nfs: add export operations
and probably a couple of other ones too are already in my tree, except
as different commits.
So now I have that twice. It merged fine, but why did that patch get
applied to two different trees?
The one I got from you in this pull request is this one:
00422483ad41 nfs: add export operations
and the one I got in your *previous* pull request is this one:
20fa19027286 nfs: add export operations
so you have screwed up something. That thing already came in through
that nfs-for-4.13-1 branch during the merge window.
I'll let it slide this time, BUT STOP REBASING YOUR BRANCHES!
Linus