5 files changed, 2 insertions, 63 deletions
diff --git a/patches.fixes/dl2k-tighten-ioctl-permissions b/patches.fixes/dl2k-tighten-ioctl-permissions
deleted file mode 100644
index bce3369..0000000
--- a/patches.fixes/dl2k-tighten-ioctl-permissions
+++ b/dev/null
@@ -1,36 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: dl2k: Tighten ioctl permissions
-Patch-mainline: Submitted to netdev, 25 Apr 2012
-References: bnc#758813
-
- dl2k's rio_ioctl function defines several ioctls that involve
- operations that should be denied to regular users.
-
- SIOCDEVPRIVATE + 2 is a renumbered SIOCSMIIREG.
- SIOCDEVPRIVATE + 5 calls netif_stop_queue.
- SIOCDEVPRIVATE + 6 calls netif_wake_queue.
-
-Reported-by: Stephan Mueller <stephan.mueller@atsec.com>
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
- drivers/net/ethernet/dlink/dl2k.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/net/ethernet/dlink/dl2k.c
-+++ b/drivers/net/ethernet/dlink/dl2k.c
-@@ -1264,6 +1264,14 @@ rio_ioctl (struct net_device *dev, struc
- 	struct netdev_desc *desc;
- 	int i;
- 
-+	switch (cmd) {
-+	case SIOCDEVPRIVATE + 2:
-+	case SIOCDEVPRIVATE + 5:
-+	case SIOCDEVPRIVATE + 6:
-+		if (!capable(CAP_NET_ADMIN))
-+			return -EPERM;
-+	};
-+
- 	phy_addr = np->phy_addr;
- 	switch (cmd) {
- 	case SIOCDEVPRIVATE:
-
diff --git a/patches.fixes/omap-usb-host-include-plat-cpu-h b/patches.fixes/omap-usb-host-include-plat-cpu-h
deleted file mode 100644
index 102f8bb..0000000
--- a/patches.fixes/omap-usb-host-include-plat-cpu-h
+++ b/dev/null
@@ -1,23 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: omap-usb-host: include <plat/cpu.h>
-Patch-mainline: Submitted 2 May 2012
-
-omap-usb-host calls cpu_is_omap3430, which is defined in plat/cpu.h.
-
-Reported-by: Guillaume GARDET <guillaume.gardet@opensuse.org>
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
- drivers/mfd/omap-usb-host.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mfd/omap-usb-host.c
-+++ b/drivers/mfd/omap-usb-host.c
-@@ -26,6 +26,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/spinlock.h>
- #include <plat/usb.h>
-+#include <plat/cpu.h>
- #include <linux/pm_runtime.h>
- 
- #define USBHS_DRIVER_NAME	"usbhs_omap"
-
diff --git a/patches.xen/xen3-patch-3.1 b/patches.xen/xen3-patch-3.1
index 29302bf..b1a38f6 100644
--- a/patches.xen/xen3-patch-3.1
+++ b/patches.xen/xen3-patch-3.1
@@ -29,7 +29,7 @@ Acked-by: jbeulich@suse.com
 +	select CLKEVT_I8253 if !XEN
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select GENERIC_IOMAP
- 	select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
+ 	select DCACHE_WORD_ACCESS
 @@ -109,7 +109,7 @@ config GENERIC_CLOCKEVENTS
  
  config ARCH_CLOCKSOURCE_DATA
diff --git a/rpm/config.sh b/rpm/config.sh
index 1acfa86..cb32369 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=3.4-rc5
+SRCVERSION=3.4-rc6
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=
 # buildservice projects to build the kernel against
diff --git a/series.conf b/series.conf
index 9987f47..349a67b 100644
--- a/series.conf
+++ b/series.conf
@@ -152,7 +152,6 @@
         # ARM
         ########################################################
 	patches.arch/arm-phys-offset.patch
-	patches.fixes/omap-usb-host-include-plat-cpu-h
 
 	########################################################
 	# S/390
@@ -375,7 +374,6 @@
 	########################################################
 	patches.fixes/tulip-quad-NIC-ifdown
 	patches.drivers/ehea-modinfo.patch
-	patches.fixes/dl2k-tighten-ioctl-permissions
 
 	########################################################
 	# Wireless Networking