Skip to content
Commit ec98ce48 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next 



Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents 3496f92b feaf3848
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment