diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-23 20:47:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-23 20:47:13 +0100 |
| commit | fa7d9a1d286e6bab49ffa59cbd3c8b394ce54339 (patch) | |
| tree | d6f472fbfc796b140213ae0906cc407978302f8e /fs/timerfd.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | Merge branch 'bugfixes' (diff) | |
| download | linux-fa7d9a1d286e6bab49ffa59cbd3c8b394ce54339.tar.xz linux-fa7d9a1d286e6bab49ffa59cbd3c8b394ce54339.zip | |
Merge tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes and cleanups from Trond Myklebust:
"Bugfixes:
- pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn
- pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN
Cleanups:
- NFS: Simplify nfs_request_add_commit_list() arguments"
* tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn
NFS: Simplify nfs_request_add_commit_list() arguments
pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions