Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/nfsd/export.c between commit 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
("fs/nfsd/export.c: Adjust error handling code involving
auth_domain_put") from the nfsd tree and commit
eec56f5904cd79d7cf99efd74ad02f39c829fff1 ("switch nfsd to kern_path()")
from the vfs tree.

The conflict is contextual. I fixed it up and can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/