remove some unneeded and broken patches

diff --git a/queue-3.14/arm-at91-dt-sama5d3-xplained-add-phy-address-for-macb1.patch b/queue-3.14/arm-at91-dt-sama5d3-xplained-add-phy-address-for-macb1.patch
deleted file mode 100644 (file)
index 0663bf0..0000000
--- a/queue-3.14/arm-at91-dt-sama5d3-xplained-add-phy-address-for-macb1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 98b80987c940956da48f0c703f60340128bb8521 Mon Sep 17 00:00:00 2001
-From: Nicolas Ferre <nicolas.ferre@atmel.com>
-Date: Tue, 31 Mar 2015 10:56:10 +0200
-Subject: ARM: at91/dt: sama5d3 xplained: add phy address for macb1
-
-From: Nicolas Ferre <nicolas.ferre@atmel.com>
-
-commit 98b80987c940956da48f0c703f60340128bb8521 upstream.
-
-After 57a38effa598 (net: phy: micrel: disable broadcast for KSZ8081/KSZ8091)
-the macb1 interface refuses to work properly because it tries
-to cling to address 0 which isn't able to communicate in broadcast with
-the mac anymore. The micrel phy on the board is actually configured
-to show up at address 1.
-Adding the phy node and its real address fixes the issue.
-
-Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-Cc: Johan Hovold <johan@kernel.org>
-Signed-off-by: Olof Johansson <olof@lixom.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/at91-sama5d3_xplained.dts |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
-+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
-@@ -107,7 +107,13 @@
- 
-                       macb1: ethernet@f802c000 {
-                               phy-mode = "rmii";
-+                              #address-cells = <1>;
-+                              #size-cells = <0>;
-                               status = "okay";
-+
-+                              ethernet-phy@1 {
-+                                      reg = <0x1>;
-+                              };
-                       };
- 
-                       dbgu: serial@ffffee00 {

diff --git a/queue-3.14/series b/queue-3.14/series
index 6479ebc7c24422534e51e8b63f36e9abac08c628..d04b1f9b9c88c89cab2f83886ac4e6604929a800 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -23,7 +23,6 @@ power_supply-lp8788-charger-fix-leaked-power-supply-on-probe-fail.patch
 nfs-fix-bug-crash-in-notify_change-with-patch-to-chown_common.patch
 arm-8320-1-fix-integer-overflow-in-elf_et_dyn_base.patch
 arm-s3c64xx-use-fixed-irq-bases-to-avoid-conflicts-on-cragganmore.patch
-arm-at91-dt-sama5d3-xplained-add-phy-address-for-macb1.patch
 arm-dts-dove-fix-uart-reg-property.patch
 usb-phy-find-the-right-match-in-devm_usb_phy_match.patch
 usb-define-a-generic-usb_resume_timeout-macro.patch

diff --git a/queue-3.19/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch b/queue-3.19/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
deleted file mode 100644 (file)
index 2d0ff20..0000000
--- a/queue-3.19/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 58995a9a5b292458f94a2356b8c878230fa56fe0 Mon Sep 17 00:00:00 2001
-From: Anton Blanchard <anton@samba.org>
-Date: Thu, 9 Apr 2015 13:51:32 +1000
-Subject: powerpc, jump_label: Include linux/jump_label.h to get HAVE_JUMP_LABEL define
-
-From: Anton Blanchard <anton@samba.org>
-
-commit 58995a9a5b292458f94a2356b8c878230fa56fe0 upstream.
-
-Commit 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
-converted uses of CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL in
-some assembly files.
-
-HAVE_JUMP_LABEL is defined in linux/jump_label.h, so we need to
-include this or we always get the non jump label fallback code.
-
-Signed-off-by: Anton Blanchard <anton@samba.org>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au>
-Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: benh@kernel.crashing.org
-Cc: catalin.marinas@arm.com
-Cc: davem@davemloft.net
-Cc: heiko.carstens@de.ibm.com
-Cc: jbaron@akamai.com
-Cc: linux@arm.linux.org.uk
-Cc: linuxppc-dev@lists.ozlabs.org
-Cc: liuj97@gmail.com
-Cc: mgorman@suse.de
-Cc: mmarek@suse.cz
-Cc: paulus@samba.org
-Cc: ralf@linux-mips.org
-Cc: rostedt@goodmis.org
-Cc: schwidefsky@de.ibm.com
-Cc: will.deacon@arm.com
-Fixes: 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
-Link: http://lkml.kernel.org/r/1428551492-21977-3-git-send-email-anton@samba.org
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/powerpc/platforms/powernv/opal-wrappers.S |    2 +-
- arch/powerpc/platforms/pseries/hvCall.S        |    2 +-
- arch/powerpc/platforms/pseries/lpar.c          |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/powerpc/platforms/powernv/opal-wrappers.S
-+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
-@@ -9,11 +9,11 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/jump_label.h>
- #include <asm/ppc_asm.h>
- #include <asm/hvcall.h>
- #include <asm/asm-offsets.h>
- #include <asm/opal.h>
--#include <asm/jump_label.h>
- 
-       .section        ".text"
- 
---- a/arch/powerpc/platforms/pseries/hvCall.S
-+++ b/arch/powerpc/platforms/pseries/hvCall.S
-@@ -7,12 +7,12 @@
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
-  */
-+#include <linux/jump_label.h>
- #include <asm/hvcall.h>
- #include <asm/processor.h>
- #include <asm/ppc_asm.h>
- #include <asm/asm-offsets.h>
- #include <asm/ptrace.h>
--#include <asm/jump_label.h>
- 
-       .section        ".text"
-       
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -26,7 +26,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/console.h>
- #include <linux/export.h>
--#include <linux/static_key.h>
-+#include <linux/jump_label.h>
- #include <asm/processor.h>
- #include <asm/mmu.h>
- #include <asm/page.h>

diff --git a/queue-3.19/series b/queue-3.19/series
index e65d7d90e5fec668b0478e536680062826960193..305a6dbcdbe07f758e5fa4bbaa42edb0b09ed73a 100644 (file)
--- a/queue-3.19/series
+++ b/queue-3.19/series
@@ -115,7 +115,6 @@ arm64-head.s-ensure-visibility-of-page-tables.patch
 arm64-apply-alternatives-for-smp-kernels.patch
 arm64-errata-add-workaround-for-cortex-a53-erratum-845719.patch
 powerpc-powernv-don-t-map-m64-segments-using-m32dt.patch
-powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
 powerpc-fix-missing-l2-cache-size-in-sys-devices-system-cpu.patch
 powerpc-cell-fix-crash-in-iic_setup_cpu-after-per_cpu-changes.patch
 powerpc-cell-fix-cell-iommu-after-it_page_shift-changes.patch

diff --git a/queue-4.0/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch b/queue-4.0/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
deleted file mode 100644 (file)
index 2d0ff20..0000000
--- a/queue-4.0/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 58995a9a5b292458f94a2356b8c878230fa56fe0 Mon Sep 17 00:00:00 2001
-From: Anton Blanchard <anton@samba.org>
-Date: Thu, 9 Apr 2015 13:51:32 +1000
-Subject: powerpc, jump_label: Include linux/jump_label.h to get HAVE_JUMP_LABEL define
-
-From: Anton Blanchard <anton@samba.org>
-
-commit 58995a9a5b292458f94a2356b8c878230fa56fe0 upstream.
-
-Commit 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
-converted uses of CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL in
-some assembly files.
-
-HAVE_JUMP_LABEL is defined in linux/jump_label.h, so we need to
-include this or we always get the non jump label fallback code.
-
-Signed-off-by: Anton Blanchard <anton@samba.org>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au>
-Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: benh@kernel.crashing.org
-Cc: catalin.marinas@arm.com
-Cc: davem@davemloft.net
-Cc: heiko.carstens@de.ibm.com
-Cc: jbaron@akamai.com
-Cc: linux@arm.linux.org.uk
-Cc: linuxppc-dev@lists.ozlabs.org
-Cc: liuj97@gmail.com
-Cc: mgorman@suse.de
-Cc: mmarek@suse.cz
-Cc: paulus@samba.org
-Cc: ralf@linux-mips.org
-Cc: rostedt@goodmis.org
-Cc: schwidefsky@de.ibm.com
-Cc: will.deacon@arm.com
-Fixes: 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
-Link: http://lkml.kernel.org/r/1428551492-21977-3-git-send-email-anton@samba.org
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/powerpc/platforms/powernv/opal-wrappers.S |    2 +-
- arch/powerpc/platforms/pseries/hvCall.S        |    2 +-
- arch/powerpc/platforms/pseries/lpar.c          |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/powerpc/platforms/powernv/opal-wrappers.S
-+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
-@@ -9,11 +9,11 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/jump_label.h>
- #include <asm/ppc_asm.h>
- #include <asm/hvcall.h>
- #include <asm/asm-offsets.h>
- #include <asm/opal.h>
--#include <asm/jump_label.h>
- 
-       .section        ".text"
- 
---- a/arch/powerpc/platforms/pseries/hvCall.S
-+++ b/arch/powerpc/platforms/pseries/hvCall.S
-@@ -7,12 +7,12 @@
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
-  */
-+#include <linux/jump_label.h>
- #include <asm/hvcall.h>
- #include <asm/processor.h>
- #include <asm/ppc_asm.h>
- #include <asm/asm-offsets.h>
- #include <asm/ptrace.h>
--#include <asm/jump_label.h>
- 
-       .section        ".text"
-       
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -26,7 +26,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/console.h>
- #include <linux/export.h>
--#include <linux/static_key.h>
-+#include <linux/jump_label.h>
- #include <asm/processor.h>
- #include <asm/mmu.h>
- #include <asm/page.h>

diff --git a/queue-4.0/series b/queue-4.0/series
index 366f4e3df62d10a182236dca434ef9f8928581dc..6087be102db63de5876d929de1fc709f4f0cdfcf 100644 (file)
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -142,7 +142,6 @@ arm64-adjust-efi-libstub-object-include-logic.patch
 arm64-apply-alternatives-for-smp-kernels.patch
 arm64-errata-add-workaround-for-cortex-a53-erratum-845719.patch
 powerpc-powernv-don-t-map-m64-segments-using-m32dt.patch
-powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch
 powerpc-fix-missing-l2-cache-size-in-sys-devices-system-cpu.patch
 powerpc-cell-fix-crash-in-iic_setup_cpu-after-per_cpu-changes.patch
 powerpc-cell-fix-cell-iommu-after-it_page_shift-changes.patch