]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c706b4 da6f881)
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 00:29:51 +0000 (10:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 00:29:51 +0000 (10:29 +1000)
1  2 
fs/nfs/nfs4file.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4file.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.