projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5483b90 df2c7b9)
Merge branch 'leases-devel'
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Mon, 21 Jun 2021 15:39:14 +0000 (11:39 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Tue, 29 Jun 2021 17:13:34 +0000 (13:13 -0400)
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1  2 
fs/nfs/inode.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/inode.c
Simple merge
diff --cc fs/nfs/nfs4proc.c
Simple merge
Domain: System / Kernel;