diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 19:57:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 19:57:14 +0100 |
| commit | 08d21b5f93eb92a781daea71b6fcb3a340909141 (patch) | |
| tree | 365a88c9d977914a6dd42dcc1c27e33f80c0b76c /net/ipv4 | |
| parent | Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | exofs: Print less in r4w (diff) | |
| download | linux-08d21b5f93eb92a781daea71b6fcb3a340909141.tar.xz linux-08d21b5f93eb92a781daea71b6fcb3a340909141.zip | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull exofs and ore fixes from Boaz Harrosh:
"The main fix here, the first patch, is also destined for -stable. The
rest is small trivia and cosmetics. The ORE patches effect both exofs
and pnfs-objects very reproducible bugs"
[ ORE is "object raid engine", used by exofs and pnfs - Linus ]
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: Print less in r4w
exofs: Allow corrupted directory entry to be empty file
exofs: Allow O_DIRECT open
ore: Don't crash on NULL bio in _clear_bio
ore: Fix wrong math in allocation of per device BIO
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions