Merge branch 'stable/for-linus-3.3.rebased' into uek2-merge

* stable/for-linus-3.3.rebased: (39 commits)
  Merge conflict resolved. Somehow the letter 's' slipped in the Makefile. This fixes the compile issues.
  xen/events: BUG() when we can't allocate our event->irq array.
  xen/granttable: Disable grant v2 for HVM domains.
  xen-blkfront: Use kcalloc instead of kzalloc to allocate array
  xen/pciback: Expand the warning message to include domain id.
  xen/pciback: Fix "device has been assigned to X domain!" warning
  xen/xenbus: don't reimplement kvasprintf via a fixed size buffer
  xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX
  xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
  Xen: consolidate and simplify struct xenbus_driver instantiation
  xen-gntalloc: introduce missing kfree
  xen/xenbus: Fix compile error - missing header for xen_initial_domain()
  xen/netback: Enable netback on HVM guests
  xen/grant-table: Support mappings required by blkback
  xenbus: Use grant-table wrapper functions
  xenbus: Support HVM backends
  xen/xenbus-frontend: Fix compile error with randconfig
  xen/xenbus-frontend: Make error message more clear
  xen/privcmd: Remove unused support for arch specific privcmp mmap
  xen: Add xenbus_backend device
  ...

Conflicts:
	drivers/xen/Kconfig
	drivers/xen/balloon.c

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/ia64/include/asm/xen/interface.h
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/input/misc/xen-kbdfront.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/Kconfig
index 640bbf534504e13b977e8c6919f8ea9ecc008035,c825a23be9620870b231839507c2ce0fb2a1d858..21369b0e43c2f11d0ba8cb14a71fee2b5d019b3c
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -147,13 -96,12 +148,19 @@@ config SWIOTLB_XE
        depends on PCI
        select SWIOTLB
  
+ 
+ config XEN_PRIVCMD
+       tristate
+       depends on XEN
+       default m
+ 
 +config XEN_TMEM
 +      bool
 +      default y if (CLEANCACHE || FRONTSWAP)
 +      help
 +        Shim to interface in-kernel Transcendent Memory hooks
 +        (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
  config XEN_PCIDEV_BACKEND
        tristate "Xen PCI-device backend driver"
        depends on PCI && X86 && XEN

diff --cc drivers/xen/Makefile
index f67450c995114184f51d2601ec407b52b3843a7b,db9ec72749658fa0d97b7dbb6ad4bf8537388623..7ef71de53823fa3351e2c55f8278de84785a8a07
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -15,13 -15,10 +15,14 @@@ obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)  += xe
  obj-$(CONFIG_XENFS)                   += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
  obj-$(CONFIG_XEN_PVHVM)                       += platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)                        += tmem.o
  obj-$(CONFIG_SWIOTLB_XEN)             += swiotlb-xen.o
  obj-$(CONFIG_XEN_DOM0)                        += pci.o
+ obj-$(CONFIG_XEN_PRIVCMD)             += xen-privcmd.o
  obj-$(CONFIG_XEN_PCIDEV_BACKEND)      += xen-pciback/
 +ifdef CONFIG_ACPI_PROCESSOR_XEN
 +obj-$(CONFIG_ACPI_PROCESSOR)          += acpi_processor.o
 +endif
  
  xen-evtchn-y                          := evtchn.o
  xen-gntdev-y                          := gntdev.o

diff --cc drivers/xen/events.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe.h
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe_backend.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe_frontend.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_xs.c
Simple merge

diff --cc include/xen/interface/io/xs_wire.h
Simple merge

diff --cc include/xen/interface/xen.h
Simple merge

diff --cc include/xen/xenbus.h
Simple merge