Merge tag 'stable/for-linus-3.16-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Jul 2014 18:02:35 +0000 (08:02 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Jul 2014 18:02:35 +0000 (08:02 -1000)
commit59ca9ee42838d0f597137cf811e47eaf42fdcb69
tree314be354db51ccd602b8459a39f5eeec76b52cdb
parent22d368544b0ed9093a3db3ee4e00a842540fcecd
parentfb9a0c443691ceaab3daba966bbbd9f5ff3aa26f
Merge tag 'stable/for-linus-3.16-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull Xen fixes from Konrad Rzeszutek Wilk:
 "Two fixes found during migration of PV guests.  David would be the one
  doing this pull but he is on vacation.

  Fixes:
   - fix console deadlock when resuming PV guests
   - fix regression hit when ballooning and resuming PV guests"

* tag 'stable/for-linus-3.16-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: set ballooned out pages as invalid in p2m
  xen/manage: fix potential deadlock when resuming the console