diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 15:04:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 15:04:26 -0800 |
| commit | ce1928da8440eb5f73c20c5c88a449a4d59209d0 (patch) | |
| tree | ddb766533d397f8c42f406c52364602ed4aa36e8 /kernel/audit.c | |
| parent | f4ca536f71ad69d9a974d0156d43b24b3f3112de (diff) | |
| parent | e9226d7c9f1d83278d78675d51acc07e1a78cb27 (diff) | |
| download | op-kernel-dev-ce1928da8440eb5f73c20c5c88a449a4d59209d0.zip op-kernel-dev-ce1928da8440eb5f73c20c5c88a449a4d59209d0.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fixes from Sage Weil:
"There is a GFP flag fix from Mike Christie, an error code fix from
Jan, and fixes for two unnecessary allocations (kmalloc and workqueue)
from Ilya. All are well tested.
Ilya has one other fix on the way but it didn't get tested in time"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: eliminate unnecessary allocation in process_one_ticket()
rbd: Fix error recovery in rbd_obj_read_sync()
libceph: use memalloc flags for net IO
rbd: use a single workqueue for all devices
Diffstat (limited to 'kernel/audit.c')
0 files changed, 0 insertions, 0 deletions
