Merge commit '24bab49122' into client-4.2

Browse source

- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
  for dependencies.

...

This commit is contained in:

Trond Myklebust 2014-09-30 16:23:39 -04:00

parent 2ce7598c9a 24bab49122

commit 4a3a0ebad1

36 changed files with 999 additions and 460 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

26

include/linux/nfs4.h

View file

2

include/linux/proc_fs.h

View file

1

include/linux/sunrpc/svc.h

View file

5

include/uapi/linux/nfsd/export.h

View file