Merge branch 'osd-devel' into nfs-for-next

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

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

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

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