summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-01-2810-90/+192
|\
| * libceph: support CEPH_FEATURE_OSD_CACHEPOOL featureIlya Dryomov2014-01-271-0/+1
| * libceph: follow redirect replies from osdsIlya Dryomov2014-01-271-0/+6
| * libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}Ilya Dryomov2014-01-271-2/+2
| * libceph: follow {read,write}_tier fields on osd request submissionIlya Dryomov2014-01-271-0/+2
| * libceph: add ceph_pg_pool_by_id()Ilya Dryomov2014-01-271-0/+3
| * libceph: CEPH_OSD_FLAG_* enum updateIlya Dryomov2014-01-271-0/+4
| * libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()Ilya Dryomov2014-01-271-2/+5
| * libceph: introduce and start using oid abstractionIlya Dryomov2014-01-272-8/+37
| * libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LENIlya Dryomov2014-01-271-2/+2
| * libceph: move ceph_file_layout helpers to ceph_fs.hIlya Dryomov2014-01-272-27/+23
| * libceph: start using oloc abstractionIlya Dryomov2014-01-272-3/+3
| * libceph: add ceph_kv{malloc,free}() and switch to themIlya Dryomov2014-01-263-6/+7
| * libceph: support CEPH_FEATURE_EXPORT_PEERYan, Zheng2014-01-211-1/+2
| * ceph: remove exported caps when handling cap import messageYan, Zheng2014-01-211-1/+10
| * ceph: handle session flush messageYan, Zheng2014-01-211-0/+2
| * libceph: rename ceph_msg::front_max to front_alloc_lenIlya Dryomov2014-01-141-1/+1
| * crush: support new indep mode and SET_* steps (crush v2) by defaultIlya Dryomov2013-12-311-1/+2
| * crush: add set_choose_local_[fallback_]tries stepsIlya Dryomov2013-12-311-0/+2
| * crush: CHOOSE_LEAF -> CHOOSELEAF throughoutIlya Dryomov2013-12-311-3/+3
| * crush: add SET_CHOOSE_TRIES rule stepIlya Dryomov2013-12-311-1/+2
| * crush: apply chooseleaf_tries to firstn mode tooIlya Dryomov2013-12-311-1/+4
| * crush: new SET_CHOOSE_LEAF_TRIES commandIlya Dryomov2013-12-311-0/+2
| * crush: use breadth-first search for indep modeIlya Dryomov2013-12-311-1/+2
| * crush: return CRUSH_ITEM_UNDEF for failed placements with indepIlya Dryomov2013-12-311-1/+2
| * crush: eliminate CRUSH_MAX_SET result size limitationIlya Dryomov2013-12-312-2/+2
| * crush: factor out (trivial) crush_destroy_rule()Ilya Dryomov2013-12-311-0/+1
| * crush: pass weight vector size to map functionIlya Dryomov2013-12-311-1/+1
| * libceph: update ceph_features.hIlya Dryomov2013-12-311-32/+64
| * libceph: all features fields must be u64Ilya Dryomov2013-12-312-9/+9
| * libceph: block I/O when PAUSE or FULL osd map flags are setJosh Durgin2013-12-131-0/+1
* | Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osdLinus Torvalds2014-01-281-0/+1
|\ \
| * | ore: Fix wrong math in allocation of per device BIOBoaz Harrosh2014-01-231-0/+1
* | | Merge tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-01-282-1/+5
|\ \ \
| * | | SUNRPC: Add tracepoint for socket errorsTrond Myklebust2013-12-311-0/+1
| * | | sunrpc: replace sunrpc_net->gssd_running flag with a more reliable checkJeff Layton2013-12-061-0/+2
| * | | sunrpc: create a new dummy pipe for gssd to hold openJeff Layton2013-12-061-1/+2
| | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-01-2810-82/+73
|\ \ \
| * | | fs: remove generic_aclChristoph Hellwig2014-01-262-14/+9
| * | | nfs: use generic posix ACL infrastructure for v3 Posix ACLsChristoph Hellwig2014-01-262-17/+11
| * | | fs: make posix_acl_create more usefulChristoph Hellwig2014-01-251-3/+12
| * | | fs: make posix_acl_chmod more usefulChristoph Hellwig2014-01-251-4/+13
| * | | fs: add generic xattr_acl handlersChristoph Hellwig2014-01-251-0/+3
| * | | fs: add a set_acl inode operationChristoph Hellwig2014-01-251-0/+1
| * | | fs: add get_acl helperChristoph Hellwig2014-01-251-0/+2
| * | | introduce __fcheck_files() to fix rcu_dereference_check_fdtable(), kill rcu_m...Oleg Nesterov2014-01-252-16/+21
| * | | nls: have register_nls() set ->ownerAl Viro2014-01-251-1/+2
| * | | cramfs: take headers to fs/cramfsAl Viro2014-01-252-30/+0
* | | | Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2014-01-277-6/+43
|\ \ \ \
| * | | | softirq: use const char * const for softirq_to_name, whitespace neateningJoe Perches2014-01-271-1/+1