summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'linaro/clk-next' into clk-nextMike Turquette2014-01-16135-4584/+28392
| |\
* | \ Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfsLinus Torvalds2014-01-294-11/+32
|\ \ \
| * | | xfs: allow logical-sector sized O_DIRECTEric Sandeen2014-01-244-3/+26
| * | | xfs: rename xfs_buftarg structure membersEric Sandeen2014-01-244-9/+9
| * | | xfs: clean up xfs_buftargEric Sandeen2014-01-243-6/+4
* | | | ceph: Fix up after semantic merge conflictLinus Torvalds2014-01-294-108/+6
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-01-2838-679/+2261
|\ \ \ \
| * | | | ceph: cast PAGE_SIZE to size_t in ceph_sync_write()Ilya Dryomov2014-01-281-1/+1
| * | | | ceph: fix dout() compile warnings in ceph_filemap_fault()Ilya Dryomov2014-01-281-3/+3
| * | | | libceph: support CEPH_FEATURE_OSD_CACHEPOOL featureIlya Dryomov2014-01-271-0/+1
| * | | | libceph: follow redirect replies from osdsIlya Dryomov2014-01-272-9/+164
| * | | | libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}Ilya Dryomov2014-01-274-23/+23
| * | | | libceph: follow {read,write}_tier fields on osd request submissionIlya Dryomov2014-01-273-5/+55
| * | | | libceph: add ceph_pg_pool_by_id()Ilya Dryomov2014-01-272-0/+8
| * | | | 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-274-18/+30
| * | | | libceph: introduce and start using oid abstractionIlya Dryomov2014-01-275-25/+50
| * | | | libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LENIlya Dryomov2014-01-273-6/+6
| * | | | libceph: move ceph_file_layout helpers to ceph_fs.hIlya Dryomov2014-01-272-27/+23
| * | | | libceph: start using oloc abstractionIlya Dryomov2014-01-274-10/+12
| * | | | libceph: dout() is missing a newlineIlya Dryomov2014-01-261-2/+2
| * | | | libceph: add ceph_kv{malloc,free}() and switch to themIlya Dryomov2014-01-266-33/+35
| * | | | libceph: support CEPH_FEATURE_EXPORT_PEERYan, Zheng2014-01-211-1/+2
| * | | | ceph: add imported caps when handling cap export messageYan, Zheng2014-01-213-82/+146
| * | | | ceph: add open export target session helperYan, Zheng2014-01-212-15/+38
| * | | | ceph: remove exported caps when handling cap import messageYan, Zheng2014-01-212-28/+62
| * | | | ceph: handle session flush messageYan, Zheng2014-01-213-0/+23
| * | | | ceph: check inode caps in ceph_d_revalidateYan, Zheng2014-01-213-3/+21
| * | | | ceph: handle -ESTALE replyYan, Zheng2014-01-211-20/+11
| * | | | ceph: fix trim capsYan, Zheng2014-01-211-6/+11
| * | | | ceph: fix cache revoke raceYan, Zheng2014-01-213-4/+8
| * | | | ceph: use ceph_seq_cmp() to compare migrate_seqYan, Zheng2014-01-211-1/+1
| * | | | ceph: handle cap export race in try_flush_caps()Yan, Zheng2014-01-211-8/+8
| * | | | ceph: trivial comment fixJ. Bruce Fields2014-01-171-3/+3
| * | | | libceph: fix preallocation check in get_reply()Ilya Dryomov2014-01-142-4/+3
| * | | | libceph: rename front to front_len in get_reply()Ilya Dryomov2014-01-141-4/+5
| * | | | libceph: rename ceph_msg::front_max to front_alloc_lenIlya Dryomov2014-01-143-8/+8
| * | | | libceph: use CEPH_MON_PORT when the specified port is 0Ilya Dryomov2013-12-311-1/+3
| * | | | crush: support new indep mode and SET_* steps (crush v2) by defaultIlya Dryomov2013-12-311-1/+2
| * | | | crush: fix crush_choose_firstn commentIlya Dryomov2013-12-311-1/+5
| * | | | crush: attempts -> triesIlya Dryomov2013-12-311-8/+8
| * | | | crush: add set_choose_local_[fallback_]tries stepsIlya Dryomov2013-12-312-5/+25
| * | | | crush: generalize descend_onceIlya Dryomov2013-12-311-11/+14
| * | | | crush: CHOOSE_LEAF -> CHOOSELEAF throughoutIlya Dryomov2013-12-312-8/+8
| * | | | crush: add SET_CHOOSE_TRIES rule stepIlya Dryomov2013-12-312-1/+7
| * | | | crush: apply chooseleaf_tries to firstn mode tooIlya Dryomov2013-12-312-5/+14
| * | | | crush: new SET_CHOOSE_LEAF_TRIES commandIlya Dryomov2013-12-312-10/+23
| * | | | crush: pass parent r value for indep callIlya Dryomov2013-12-311-4/+6
| * | | | crush: clarify numrep vs endposIlya Dryomov2013-12-311-8/+8
| * | | | crush: strip firstn conditionals out of crush_choose, renameIlya Dryomov2013-12-311-55/+33