]> 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, 4 Dec 2012 21:31:31 +0000 (16:31 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 4 Dec 2012 21:31:31 +0000 (16:31 -0500)
commita3420cd6b5efa4bfaa01e96a83afed8ba468debe
treebc4b56fdfdff46ec7c9c18c2d9a6d9b1a7d297d6
parent7168554bd49110b06ebefcce07bf196a7f4ab802
parenteb32e1b3718283766d8789b9a3063494370e73d0
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge

* stable/for-linus-3.7.rebased: (92 commits)
  xen/arm: Fix compile errors when drivers are compiled as modules (export more).
  xen/arm: Fix compile errors when drivers are compiled as modules.
  xen/generic: Disable fallback build on ARM.
  xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.
  xen/hypercall: fix hypercall fallback code for very old hypervisors
  xen/arm: use the __HVC macro
  xen/xenbus: fix overflow check in xenbus_file_write()
  xen-kbdfront: handle backend CLOSED without CLOSING
  xen-fbfront: handle backend CLOSED without CLOSING
  xen/gntdev: don't leak memory from IOCTL_GNTDEV_MAP_GRANT_REF
  x86: remove obsolete comment from asm/xen/hypervisor.h
  xen: dbgp: Fix warning when CONFIG_PCI is not enabled.
  USB EHCI/Xen: propagate controller reset information to hypervisor
  xen: arm: comment on why 64-bit xen_pfn_t is safe even on 32 bit
  xen: balloon: use correct type for frame_list
  xen/x86: don't corrupt %eip when returning from a signal handler
  xen: arm: make p2m operations NOPs
  xen: balloon: don't include e820.h
  xen: events: pirq_check_eoi_map is X86 specific
  xen: XENMEM_translate_gpfn_list was remove ages ago and is unused.
  ...

Conflicts:
arch/ia64/include/asm/xen/interface.h
arch/x86/include/asm/xen/interface.h
arch/x86/xen/Makefile
arch/x86/xen/enlighten.c
arch/x86/xen/vga.c
arch/x86/xen/xen-ops.h
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/swiotlb-xen.c
drivers/xen/xen-acpi-processor.c
drivers/xen/xen-selfballoon.c
include/xen/interface/physdev.h
include/xen/interface/platform.h
include/xen/interface/xen.h
24 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/x86/include/asm/xen/hypercall.h
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
arch/x86/xen/enlighten.c
arch/x86/xen/xen-ops.h
drivers/block/xen-blkback/blkback.c
drivers/input/misc/xen-kbdfront.c
drivers/net/xen-netback/netback.c
drivers/net/xen-netfront.c
drivers/pci/xen-pcifront.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/events.c
drivers/xen/gntdev.c
drivers/xen/grant-table.c
drivers/xen/xenbus/xenbus_probe.c
include/xen/grant_table.h
include/xen/interface/physdev.h
include/xen/interface/platform.h
include/xen/interface/xen.h