Merge part 2 of branch 'sysfs-devel'

author Trond Myklebust <[email protected]>

Sat, 26 Jun 2021 16:20:23 +0000 (12:20 -0400)

committer Trond Myklebust <[email protected]>

Thu, 8 Jul 2021 18:03:26 +0000 (14:03 -0400)
author Trond Myklebust <[email protected]>
Sat, 26 Jun 2021 16:20:23 +0000 (12:20 -0400)
committer Trond Myklebust <[email protected]>
Thu, 8 Jul 2021 18:03:26 +0000 (14:03 -0400)
diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
author	Trond Myklebust <[email protected]>
	Sat, 26 Jun 2021 16:20:23 +0000 (12:20 -0400)
committer	Trond Myklebust <[email protected]>
	Thu, 8 Jul 2021 18:03:26 +0000 (14:03 -0400)
		1	2
fs/nfs/nfs4proc.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	patch \|	diff1 \|	diff2 \|	blob \| history