summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-sa110.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-23 02:47:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-23 02:47:08 +0200
commit002b758b6dc4d840e662f25625f696d7b43d48f4 (patch)
tree99c83d7622066cdf7bb5d467f0017b2360fb7ada /arch/arm/mm/proc-sa110.S
parentMerge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs (diff)
parentlibceph: flush msgr queue during mon_client shutdown (diff)
downloadlinux-002b758b6dc4d840e662f25625f696d7b43d48f4.tar.xz
linux-002b758b6dc4d840e662f25625f696d7b43d48f4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil: "There are a couple of fixes from Yan for bad pointer dereferences in the messenger code and when fiddling with page->private after page migration, a fix from Alex for a use-after-free in the osd client code, and a couple fixes for the message refcounting and shutdown ordering." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: flush msgr queue during mon_client shutdown rbd: Clear ceph_msg->bio_iter for retransmitted message libceph: use con get/put ops from osd_client libceph: osd_client: don't drop reply reference too early ceph: check PG_Private flag before accessing page->private
Diffstat (limited to 'arch/arm/mm/proc-sa110.S')
0 files changed, 0 insertions, 0 deletions