]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
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)
commite9e8ee40b37af80626236517d6b7f110526bf2ff
treeaea6c0b3440b38ed03ccff02c1f8577c1e746029
parent5483b904bf336948826594610af4c9bbb0d9e3aa
parentdf2c7b951f439a0342495a4a049d808f679c474c
Merge branch 'leases-devel'

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/inode.c
fs/nfs/nfs4proc.c