diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 11:28:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 11:28:24 -0700 |
| commit | d5adf7e2db897f9d4a00be59262875ae5d9574f4 (patch) | |
| tree | c6417bfea552f653d5639b4696a5ac987cd7bc40 /fs/btrfs/send.c | |
| parent | 02b9735c12892e04d3e101b06e4c6d64a814f566 (diff) | |
| parent | 6a6f6e72eca5ed999689c69d1ac411fe319844a0 (diff) | |
Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen balloon driver bug-fixes from Stefano Stabellini:
- fix a preemption bug in xen/balloon.c;
- remove an harmful BUG_ON in xen/balloon.c that can trigger in
non-erroneous situations.
* tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: remove BUG_ON in increase_reservation
xen/balloon: ensure preemption is disabled when using a scratch page
Diffstat (limited to 'fs/btrfs/send.c')
0 files changed, 0 insertions, 0 deletions