Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 05:03:16 +0000 (21:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 05:03:16 +0000 (21:03 -0800)
commit500dd2370e77c9551ba298bdeeb91b02d8402199
treea1e94caef4032fec934aee7da34d6551a80e7da7
parentf6bd5798f3b7583f7e984f8408ffb5b36ece174f
parent8eaffa67b43e99ae581622c5133e20b0f48bcef1
Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git./linux/kernel/git/konrad/xen

Two fixes to fix a memory corruption bug when WC pages never get
converted back to WB but end up being recycled in the general memory
pool as WC.

There is a better way of fixing this, but there is not enough time to do
the full benchmarking to pick one of the right options - so picking the
one that favors stability for right now.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
* tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pat: Disable PAT support for now.
  xen/setup: Remove redundant filtering of PTE masks.