diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 02:20:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-12 02:20:38 +0200 |
commit | 7f8730781830cd38438b10d44d17ccb8eafa9265 (patch) | |
tree | d55b94979c921f936c043c328a2943e3d695127e /kernel/seccomp.c | |
parent | Merge git://git.infradead.org/users/willy/linux-nvme (diff) | |
parent | raid5: get_active_stripe avoids device_lock (diff) | |
download | linux-7f8730781830cd38438b10d44d17ccb8eafa9265.tar.xz linux-7f8730781830cd38438b10d44d17ccb8eafa9265.zip |
Merge tag 'md/3.15' of git://neil.brown.name/md
Pull md updates from Neil Brown:
"Just a few md patches for the 3.15 merge window.
Not much happening in md/raid at the moment. Just a few bug fixes
(one for -stable) and a couple of performance tweaks"
* tag 'md/3.15' of git://neil.brown.name/md:
raid5: get_active_stripe avoids device_lock
raid5: make_request does less prepare wait
md: avoid oops on unload if some process is in poll or select.
md/raid1: r1buf_pool_alloc: free allocate pages when subsequent allocation fails.
md/bitmap: don't abuse i_writecount for bitmap files.
Diffstat (limited to 'kernel/seccomp.c')
0 files changed, 0 insertions, 0 deletions