Merge tag 'v4.12-rc5' into nfsd tree

Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/nfsd/nfs3xdr.c
Simple merge

diff --cc fs/nfsd/nfs4proc.c
Simple merge

diff --cc fs/nfsd/nfsxdr.c
Simple merge

diff --cc include/linux/sunrpc/svc.h
Simple merge