]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 6 Nov 2012 14:51:40 +0000 (09:51 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 6 Nov 2012 14:51:40 +0000 (09:51 -0500)
commitf9836940d6d3de7bc988fa26b0b6c8499108160d
tree10e83dd29597322c8fa5f02901d535f9f5a04040
parentf5463f8038384eeb7401c896e47d25cb87178cc7
parent2499a78f6124951f26a65c5da1bc5bb3bb0d8192
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge

* stable/for-linus-3.7.rebased:
  xen/mmu: Use Xen specific TLB flush instead of the generic one.
  xen: resynchronise grant table status codes with upstream
  xen/privcmd: return -EFAULT on error
  xen/privcmd: Fix mmap batch ioctl error status copy back.
  xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl
  xen/mm: return more precise error from xen_remap_domain_range()
  xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
  xen/swiotlb: Remove functions not needed anymore.
  xen: allow privcmd for HVM guests
  xen/sysfs: Use XENVER_guest_handle to query UUID
  xen/apic/xenbus/swiotlb/pcifront/grant/tmem: Make functions or variables static.
  xen: missing includes
  xen: update xen_add_to_physmap interface

Conflicts:
include/xen/interface/grant_table.h
12 files changed:
arch/ia64/include/asm/xen/interface.h
arch/x86/include/asm/xen/interface.h
arch/x86/xen/enlighten.c
drivers/pci/xen-pcifront.c
drivers/xen/gntdev.c
drivers/xen/grant-table.c
drivers/xen/swiotlb-xen.c
drivers/xen/sys-hypervisor.c
drivers/xen/tmem.c
drivers/xen/xenbus/xenbus_probe.c
drivers/xen/xenbus/xenbus_probe_frontend.c
include/xen/interface/xen.h