Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/p2m: Fix module linking error.
  xen p2m: clear the old pte when adding a page to m2p_override
  xen gntdev: use gnttab_map_refs and gnttab_unmap_refs
  xen: introduce gnttab_map_refs and gnttab_unmap_refs
  xen p2m: transparently change the p2m mappings in the m2p override
  xen/gntdev: Fix circular locking dependency
  xen/gntdev: stop using "token" argument
  xen: gntdev: move use of GNTMAP_contains_pte next to the map_op
  xen: add m2p override mechanism
  xen: move p2m handling to separate file
  xen/gntdev: add VM_PFNMAP to vma
  xen/gntdev: allow usermode to map granted pages
  xen: define gnttab_set_map_op/unmap_op

Fix up trivial conflict in drivers/xen/Kconfig

diff --cc drivers/xen/Kconfig
index 464d893,bd3095f..07bec09
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -70,8 -62,12 +70,15 @@@ config XEN_SYS_HYPERVISO
         virtual environment, /sys/hypervisor will still be present,
         but will have no xen contents.
  
-        tristate
 +config XEN_XENBUS_FRONTEND
++      tristate
++
+ config XEN_GNTDEV
+       tristate "userspace grant access device driver"
+       depends on XEN
+       select MMU_NOTIFIER
+       help
+         Allows userspace processes to use grants.
  
  config XEN_PLATFORM_PCI
        tristate "xen platform pci device driver"

diff --cc drivers/xen/Makefile
index f81819b,674fdb5..5088cc2
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -9,12 -9,13 +9,14 @@@ obj-$(CONFIG_HOTPLUG_CPU)     += cpu_hotplu
  obj-$(CONFIG_XEN_XENCOMM)     += xencomm.o
  obj-$(CONFIG_XEN_BALLOON)     += balloon.o
  obj-$(CONFIG_XEN_DEV_EVTCHN)  += xen-evtchn.o
+ obj-$(CONFIG_XEN_GNTDEV)      += xen-gntdev.o
  obj-$(CONFIG_XENFS)           += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
 -obj-$(CONFIG_XEN_PLATFORM_PCI)        += platform-pci.o
 +obj-$(CONFIG_XEN_PLATFORM_PCI)        += xen-platform-pci.o
  obj-$(CONFIG_SWIOTLB_XEN)     += swiotlb-xen.o
  obj-$(CONFIG_XEN_DOM0)                += pci.o
  
  xen-evtchn-y                  := evtchn.o
+ xen-gntdev-y                          := gntdev.o
  
 +xen-platform-pci-y            := platform-pci.o