From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 5 Dec 2012 20:09:29 +0000 (-0500)
Subject: Merge tag 'uek2-merge-backport-3.8' of git://ca-git/linux-konrad-public into uek2... 
X-Git-Tag: v2.6.39-400.9.0~33^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5c9ae850f1d8052df669d7b11b08623d24a805c5;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'uek2-merge-backport-3.8' of git://ca-git/linux-konrad-public into uek2-merge-400

Backport from v3.8 and from not-upstreamed branch.

We are backporting from v3.8:
 - feature-persistent in the block layer.
 - Xen PAD driver for Intel machines
 - PVonHVM kexec fixes
 - Lay work for PVH mode (so more ARM code)

From the not-upstreamed branch:
 - oprofile for Xen.

* tag 'uek2-merge-backport-3.8' of git://ca-git/linux-konrad-public: (35 commits)
  xen: arm: implement remap interfaces needed for privcmd mappings.
  xen: correctly use xen_pfn_t in remap_domain_mfn_range.
  xen: arm: enable balloon driver
  xen: balloon: allow PVMMU interfaces to be compiled out
  xen: privcmd: support autotranslated physmap guests.
  xen: add pages parameter to xen_remap_domain_mfn_range
  xen/PVonHVM: fix compile warning in init_hvm_pv_info
  xen/acpi: Move the xen_running_on_version_or_later function.
  xen/xenbus: Remove duplicate inclusion of asm/xen/hypervisor.h
  xen/acpi: Fix compile error by missing decleration for xen_domain.
  xen/acpi: revert pad config check in xen_check_mwait
  xen/acpi: ACPI PAD driver
  xen PVonHVM: use E820_Reserved area for shared_info
  xen-blkfront: free allocated page
  xen-blkback: move free persistent grants code
  xen/blkback: persistent-grants fixes
  xen/blkback: Persistent grant maps for xen blk drivers
  xen/blkback: Change xen_vbd's flush_support and discard_secure to have type unsigned int, rather than bool
  xen/blkback: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  xen/blkfront: Add WARN to deal with misbehaving backends.
  ...
---

5c9ae850f1d8052df669d7b11b08623d24a805c5