Merge branch 'bugfixes' into nfs-for-next

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

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

diff --cc fs/nfs/nfs4xdr.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

diff --cc net/sunrpc/rpc_pipe.c
Simple merge