Merge tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

Pull Xen updates from David Vrabel:
 - remove unused V2 grant table support
 - note that Konrad is xen-blkkback/front maintainer
 - add 'xen_nopv' option to disable PV extentions for x86 HVM guests
 - misc minor cleanups

* tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-pciback: Document the 'quirks' sysfs file
  xen/pciback: Fix error return code in xen_pcibk_attach()
  xen/events: drop negativity check of unsigned parameter
  xen/setup: Remove Identity Map Debug Message
  xen/events/fifo: remove a unecessary use of BM()
  xen/events/fifo: ensure all bitops are properly aligned even on x86
  xen/events/fifo: reset control block and local HEADs on resume
  xen/arm: use BUG_ON
  xen/grant-table: remove support for V2 tables
  x86/xen: safely map and unmap grant frames when in atomic context
  MAINTAINERS: Make me the Xen block subsystem (front and back) maintainer
  xen: Introduce 'xen_nopv' to disable PV extensions for HVM guests.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/xen/grant-table.c
index 91cf08ba1e957d251fcb5b0028705a4cd52a7fd8,e43791829aceb2a725d45b419b36c21b54ec0300..2c4041c9bac5e18e320d25b0577d034c52514b43
--- 1/arch/arm/xen/grant-table.c
--- 2/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@@ -45,14 -45,7 +45,12 @@@ void arch_gnttab_unmap(void *shared, un
        return;
  }
  
- int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
-                          unsigned long max_nr_gframes,
-                          grant_status_t **__shared)
+ int arch_gnttab_init(unsigned long nr_shared)
  {
-       return -ENOSYS;
+       return 0;
  }
 +
 +int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
 +{
 +      return 0;
 +}

diff --cc arch/x86/xen/enlighten.c
Simple merge