diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 01:52:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 01:52:29 +0200 |
| commit | 7ee2d2d67144965d9d3607369ab0ebf5bad230c0 (patch) | |
| tree | 259e81c30fe6d168684210fa3978a35fd77badae /drivers/w1/masters | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe... (diff) | |
| parent | x86/xen: don't copy bogus duplicate entries into kernel page tables (diff) | |
| download | linux-7ee2d2d67144965d9d3607369ab0ebf5bad230c0.tar.xz linux-7ee2d2d67144965d9d3607369ab0ebf5bad230c0.zip | |
Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bug fixes from David Vrabel:
- fix for PVHVM suspend/resume and migration
- don't pointlessly retry certain ballooning ops
- fix gntalloc when grefs have run out.
- fix PV boot if KSALR is enable or very large modules are used.
* tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: don't copy bogus duplicate entries into kernel page tables
xen/gntalloc: safely delete grefs in add_grefs() undo path
xen/gntalloc: fix oops after runnning out of grant refs
xen/balloon: cancel ballooning if adding new memory failed
xen/manage: Always freeze/thaw processes when suspend/resuming
Diffstat (limited to 'drivers/w1/masters')
0 files changed, 0 insertions, 0 deletions