Update to 3.13.4

svn path=/dists/sid/linux/; revision=21052

3 files changed, 3 insertions, 121 deletions

diff --git a/debian/changelog b/debian/changelog
index d62bff869249..9182d86702a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-linux (3.13.2-1~exp1) UNRELEASED; urgency=low
+linux (3.13.4-1) UNRELEASED; urgency=low
 
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.1
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.2
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.3
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.4
 
   [ Ben Hutchings ]
   * [x86] Enable POWERCAP, INTEL_RAPL as module (Closes: #736399)
diff --git a/debian/patches/bugfix/arm/ARM-orion-provide-C-style-interrupt-handler-for-MULTI_IRQ_HANDLER.patch b/debian/patches/bugfix/arm/ARM-orion-provide-C-style-interrupt-handler-for-MULTI_IRQ_HANDLER.patch
deleted file mode 100644
index 5ca0fa483379..000000000000
--- a/debian/patches/bugfix/arm/ARM-orion-provide-C-style-interrupt-handler-for-MULTI_IRQ_HANDLER.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-Subject: [PATCH] ARM: orion: provide C-style interrupt handler for
- MULTI_IRQ_HANDLER
-Date: Thu, 16 Jan 2014 09:10:31 +0100
-Message-Id: <1389859831-9883-1-git-send-email-sebastian.hesselbarth@gmail.com>
-
-DT-enabled Marvell Kirkwood and Dove SoCs make use of an irqchip
-driver. As expected for irqchip drivers, it uses a C-style
-interrupt handler and therefore selects MULTI_IRQ_HANDLER.
-
-Now, compiling a kernel with both non-DT and DT support enabled,
-selecting MULTI_IRQ_HANDLER will break ASM irq handler used by
-non-DT boards.
-
-Therefore, we provide a C-style irq handler even for non-DT boards,
-if MULTI_IRQ_HANDLER is set. By installing the C-style irq handler
-in orion_irq_init this is transparent to all non-DT board files.
-
-While the regression report was filed on Marvell Kirkwood, also
-Marvell Dove non-DT boards are affected and fixed by this patch.
-
-Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-Tested-by: Ian Campbell <ijc@hellion.org.uk>
-Reported-by: Ian Campbell <ijc@hellion.org.uk>
-Fixes: 2326f04321a9 ("ARM: kirkwood: convert to DT irqchip and clocksource")
-Fixes: f07d73e33d0e ("ARM: dove: convert to DT irqchip and clocksource")
----
-Compared to the two patch version sent on Ian's regression report,
-I cooked this down to a single patch only touching plat-orion/irq.c.
-I also dropped Orion5x and MV78x00, as they not yet select MULTI_IRQ_HANDLER
-at all. Instead I added a comment about taking care of them, as soon as
-they move over to an irqchip driver themselves.
-
-I have not yet Cc'ed this patch to -stable to get some discussion and
-an Acked-by from Jason or Andrew, too.
-
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-Cc: Russell King <linux@arm.linux.org.uk>
-Cc: Ian Campbell <ijc@hellion.org.uk>
-Cc: linux-arm-kernel@lists.infradead.org
-Cc: linux-kernel@vger.kernel.org
----
- arch/arm/plat-orion/irq.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 47 insertions(+)
-
-diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
-index c492e1b3dfdb..807df142444b 100644
---- a/arch/arm/plat-orion/irq.c
-+++ b/arch/arm/plat-orion/irq.c
-@@ -15,8 +15,51 @@
- #include <linux/io.h>
- #include <linux/of_address.h>
- #include <linux/of_irq.h>
-+#include <asm/exception.h>
- #include <plat/irq.h>
- #include <plat/orion-gpio.h>
-+#include <mach/bridge-regs.h>
-+
-+#ifdef CONFIG_MULTI_IRQ_HANDLER
-+/*
-+ * Compiling with both non-DT and DT support enabled, will
-+ * break asm irq handler used by non-DT boards. Therefore,
-+ * we provide a C-style irq handler even for non-DT boards,
-+ * if MULTI_IRQ_HANDLER is set.
-+ *
-+ * Notes:
-+ * - this is prepared for Kirkwood and Dove only, update
-+ *   accordingly if you add Orion5x or MV78x00.
-+ * - Orion5x uses different macro names and has only one
-+ *   set of CAUSE/MASK registers.
-+ * - MV78x00 uses the same macro names but has a third
-+ *   set of CAUSE/MASK registers.
-+ *
-+ */
-+
-+static void __iomem *orion_irq_base = IRQ_VIRT_BASE;
-+
-+asmlinkage void
-+__exception_irq_entry orion_legacy_handle_irq(struct pt_regs *regs)
-+{
-+	u32 stat;
-+
-+	stat = readl_relaxed(orion_irq_base + IRQ_CAUSE_LOW_OFF);
-+	stat &= readl_relaxed(orion_irq_base + IRQ_MASK_LOW_OFF);
-+	if (stat) {
-+		unsigned int hwirq = __fls(stat);
-+		handle_IRQ(hwirq, regs);
-+		return;
-+	}
-+	stat = readl_relaxed(orion_irq_base + IRQ_CAUSE_HIGH_OFF);
-+	stat &= readl_relaxed(orion_irq_base + IRQ_MASK_HIGH_OFF);
-+	if (stat) {
-+		unsigned int hwirq = 32 + __fls(stat);
-+		handle_IRQ(hwirq, regs);
-+		return;
-+	}
-+}
-+#endif
- 
- void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
- {
-@@ -35,6 +78,10 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
- 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
- 	irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE,
- 			       IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
-+
-+#ifdef CONFIG_MULTI_IRQ_HANDLER
-+	set_handle_irq(orion_legacy_handle_irq);
-+#endif
- }
- 
- #ifdef CONFIG_OF
--- 
-1.8.5.2
-
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 330840f30b4b..42209773f356 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -76,6 +76,5 @@ debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
 bugfix/all/disable-some-marvell-phys.patch
 features/all/media-az6007-support-Technisat-Cablestar-Combo-HDCI-.patch
 bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch
-bugfix/arm/ARM-orion-provide-C-style-interrupt-handler-for-MULTI_IRQ_HANDLER.patch
 bugfix/all/i2c-designware-remove-HAVE_CLK-build-dependecy.patch
 debian/snd-pcsp-disable-autoload.patch