]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.3.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 20:03:05 +0000 (15:03 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 20:03:05 +0000 (15:03 -0500)
commit1a9f2c653d0b507743033879cfd23d50cea9dffa
treebdbffc42c67e4dbed2627486b2d735f1fce8e454
parent3229a8d998844ca3b8d54e6c2d5ce69b65dedde7
parent70a3d8d324b9aa4dc130c01029b042d89cda071f
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>
19 files changed:
MAINTAINERS
arch/ia64/include/asm/xen/interface.h
drivers/block/xen-blkback/xenbus.c
drivers/block/xen-blkfront.c
drivers/input/misc/xen-kbdfront.c
drivers/net/xen-netback/netback.c
drivers/net/xen-netfront.c
drivers/pci/xen-pcifront.c
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/events.c
drivers/xen/xenbus/xenbus_probe.c
drivers/xen/xenbus/xenbus_probe.h
drivers/xen/xenbus/xenbus_probe_backend.c
drivers/xen/xenbus/xenbus_probe_frontend.c
drivers/xen/xenbus/xenbus_xs.c
include/xen/interface/io/xs_wire.h
include/xen/interface/xen.h
include/xen/xenbus.h