From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Mar 2011 17:32:15 +0000 (-0700)
Subject: Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of git://git.kernel... 
X-Git-Tag: v2.6.39-rc1~521
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c7146dd0090b9c98ae8525900abf1c38fc7e4e0d;p=~shefty%2Frdma-dev.git

Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/p2m-identity.v4.9.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set..
  xen/m2p: No need to catch exceptions when we know that there is no RAM
  xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.
  xen/debugfs: Add 'p2m' file for printing out the P2M layout.
  xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.
  xen/mmu: WARN_ON when racing to swap middle leaf.
  xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN.
  xen/mmu: Add the notion of identity (1-1) mapping.
  xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY.

* 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as guest and fix overflow.
  xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps.
---

c7146dd0090b9c98ae8525900abf1c38fc7e4e0d