diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 13:40:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 13:40:42 -0800 |
| commit | ce6b71432d42afe5c3ae25ab2980304c32ecb915 (patch) | |
| tree | 26d28f9894cccbffde8e051b69c6c61ea19b7e40 /fs/proc/namespaces.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5 (diff) | |
| download | linux-dev-ce6b71432d42afe5c3ae25ab2980304c32ecb915.tar.xz linux-dev-ce6b71432d42afe5c3ae25ab2980304c32ecb915.zip | |
Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"My for-linus-4.5 branch has a btrfs DIO error passing fix.
I know how much you love DIO, so I'm going to suggest against reading
it. We'll follow up with a patch to drop the error arg from
dio_end_io in the next merge window."
* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix direct IO requests not reporting IO error to user space
Diffstat (limited to 'fs/proc/namespaces.c')
0 files changed, 0 insertions, 0 deletions