diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 18:30:10 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 18:30:10 (GMT) |
commit | 1204c464458e9837320a326a9fce550e3c5ef5de (patch) | |
tree | f0e19354d7d0d5553a0e0e6f7fd7c7e2f8465696 /drivers/mtd/maps/sa1100-flash.c | |
parent | 4f2112351b4ac964b0249bdd883f7b79601f39d8 (diff) | |
parent | f77303bddabf73ebccb60f613b77da391f933cf6 (diff) | |
download | linux-1204c464458e9837320a326a9fce550e3c5ef5de.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph updates from Sage Weil:
"This time around we have a collection of CephFS fixes from Zheng
around MDS failure handling and snapshots, support for a new CRUSH
straw2 algorithm (to sync up with userspace) and several RBD cleanups
and fixes from Ilya, an error path leak fix from Taesoo, and then an
assorted collection of cleanups from others"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
rbd: rbd_wq comment is obsolete
libceph: announce support for straw2 buckets
crush: straw2 bucket type with an efficient 64-bit crush_ln()
crush: ensuring at most num-rep osds are selected
crush: drop unnecessary include from mapper.c
ceph: fix uninline data function
ceph: rename snapshot support
ceph: fix null pointer dereference in send_mds_reconnect()
ceph: hold on to exclusive caps on complete directories
libceph: simplify our debugfs attr macro
ceph: show non-default options only
libceph: expose client options through debugfs
libceph, ceph: split ceph_show_options()
rbd: mark block queue as non-rotational
libceph: don't overwrite specific con error msgs
ceph: cleanup unsafe requests when reconnecting is denied
ceph: don't zero i_wrbuffer_ref when reconnecting is denied
ceph: don't mark dirty caps when there is no auth cap
ceph: keep i_snap_realm while there are writers
libceph: osdmap.h: Add missing format newlines
...
Diffstat (limited to 'drivers/mtd/maps/sa1100-flash.c')
0 files changed, 0 insertions, 0 deletions