From: Linus Torvalds Date: Wed, 4 May 2011 21:22:20 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... X-Git-Tag: upstream/snapshot3+hdmi~10516 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: do not call __mark_dirty_inode under i_lock libceph: fix ceph_osdc_alloc_request error checks ceph: handle ceph_osdc_new_request failure in ceph_writepages_start libceph: fix ceph_msg_new error path ceph: use ihold() when i_lock is held --- bd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f