linux-kernel - linux-next: manual merge of the swiotlb-xen tree with the xen tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20101213142609.3ad004cf.sfr@canb.auug.org.au>
Date:	Mon, 13 Dec 2010 14:26:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gerd Hoffmann <kraxel@...hat.com>,
	Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
	Jeremy Fitzhardinge <jeremy@...p.org>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	Ian Campbell <ian.campbell@...rix.com>
Subject: linux-next: manual merge of the swiotlb-xen tree with the xen tree

Hi Konrad,

Today's linux-next merge of the swiotlb-xen tree got a conflict in
drivers/xen/Kconfig drivers/xen/Makefile between commit
56385560d6d8fd4c89c4f328d3ff0ecc9c44c52d ("xen/gntdev: allow usermode to
map granted pages") from the xen tree and commits
06acb015d341946c83ab127f5ab9ba291678d226 ("xen: separate out frontend
xenbus") and 721657d92623cfcf2f6f68c14abf97eb40fa6b20 ("xen-pciback:
Enable Xen-PCI-back to be compiled") from the swiotlb-xen tree.

I fixed then up (see below) and can carry the fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/xen/Kconfig
index 0c6d2a1,9b61561..0000000
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -62,13 -134,9 +134,16 @@@ config XEN_SYS_HYPERVISO
  	 virtual environment, /sys/hypervisor will still be present,
  	 but will have no xen contents.
  
 +config XEN_GNTDEV
 +	tristate "userspace grant access device driver"
 +	depends on XEN
 +	select MMU_NOTIFIER
 +	help
 +	  Allows userspace processes use grants.
 +	  
+ config XEN_XENBUS_FRONTEND
+        tristate
+ 
  config XEN_PLATFORM_PCI
  	tristate "xen platform pci device driver"
  	depends on XEN_PVHVM
diff --cc drivers/xen/Makefile
index 674fdb5,b813d46..0000000
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -9,7 -9,7 +9,8 @@@ 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_XEN_PCIDEV_BACKEND)	+= pciback/
  obj-$(CONFIG_XENFS)		+= xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
  obj-$(CONFIG_XEN_PLATFORM_PCI)	+= platform-pci.o
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/