linux-next: manual merge of the userns tree with the nfs tree

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/nfs/client.c between commit 21e81002f978 ("nfs: fix kernel warning when removing proc entry") from the nfs tree and commit a1998908ba46 ("nfs: fix kernel warning when removing proc entry") from the userns tree. Slightly

linux-next: manual merge of the userns tree with the nfs tree

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/nfs/client.c between commit 21e81002f978 (nfs: fix kernel warning when removing proc entry) from the nfs tree and commit a1998908ba46 (nfs: fix kernel warning when removing proc entry) from the userns tree. Slightly