From: Linus Torvalds Date: Tue, 5 Jul 2011 20:15:57 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... X-Git-Tag: firefly_0821_release~3680^2~5118 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=121782a248f11c63c7c0fc78d4a68a54e99ee37d;p=firefly-linux-kernel-4.4.55.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: fix sync and dio writes across stripe boundaries libceph: fix page calculation for non-page-aligned io ceph: fix page alignment corrections --- 121782a248f11c63c7c0fc78d4a68a54e99ee37d