summaryrefslogtreecommitdiffstats
path: root/sound/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2013-11-27 03:02:46 +0100
committerLinus Torvalds2013-11-27 03:02:46 +0100
commit4f9e5df211a8591b3fb5c154ecc7ec5d4ecd6b79 (patch)
treeba4e3980540d5bf082bc38f0107b628b2b726a25 /sound/Makefile
parentMerge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentceph: allocate non-zero page to fscache in readpage() (diff)
downloadkernel-qcow2-linux-4f9e5df211a8591b3fb5c154ecc7ec5d4ecd6b79.tar.gz
kernel-qcow2-linux-4f9e5df211a8591b3fb5c154ecc7ec5d4ecd6b79.tar.xz
kernel-qcow2-linux-4f9e5df211a8591b3fb5c154ecc7ec5d4ecd6b79.zip
Merge branch 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph bug-fixes from Sage Weil: "These include a couple fixes to the new fscache code that went in during the last cycle (which will need to go stable@ shortly as well), a couple client-side directory fragmentation fixes, a fix for a race in the cap release queuing path, and a couple race fixes in the request abort and resend code. Obviously some of this could have gone into 3.12 final, but I preferred to overtest rather than send things in for a late -rc, and then my travel schedule intervened" * 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: allocate non-zero page to fscache in readpage() ceph: wake up 'safe' waiters when unregistering request ceph: cleanup aborted requests when re-sending requests. ceph: handle race between cap reconnect and cap release ceph: set caps count after composing cap reconnect message ceph: queue cap release in __ceph_remove_cap() ceph: handle frag mismatch between readdir request and reply ceph: remove outdated frag information ceph: hung on ceph fscache invalidate in some cases
Diffstat (limited to 'sound/Makefile')
0 files changed, 0 insertions, 0 deletions