From 26783922e0dcef7b5652ac0990c7e7f5fb1fa1e2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 28 Sep 2015 02:58:48 +0100 Subject: [PATCH] Correct some patch headers --- ...4-add-missing-dts-entry-for-X-Gene-platform.patch | 12 ++++++------ ...oved-using-of-the-mask-attribute-in-the-dts.patch | 12 +++++------- ...bpf-avoid-unreachable-code-on-little-endian.patch | 2 +- .../bpf-fix-build-on-pre-r2-little-endian-cpus.patch | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch b/debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch index b970c8efd..41512dfab 100644 --- a/debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch +++ b/debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch @@ -1,6 +1,5 @@ -From 2d209a4c68627218140f29ca31ee1f01ce476b89 Mon Sep 17 00:00:00 2001 -From: Ian Campbell -Date: Wed, 26 Nov 2014 15:30:03 +0000 +From: Feng Kan +Date: Wed, 4 Dec 2013 13:33:32 -0500 Subject: [PATCH 1/2] arm64: add missing dts entry for X-Gene platform. Origin: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216347.html @@ -8,9 +7,10 @@ This add missing dts entry for X-Gene reboot driver. Signed-off-by: Feng Kan -ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too -big to backport. -[bwh: Forward-ported to 3.19] +[ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too + big to backport.] +[bwh: Forward-ported to 3.19. Upstream now has both drivers and still nothing + in this file.] --- arch/arm64/boot/dts/apm/apm-storm.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch b/debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch index b09a8adc3..114b7275b 100644 --- a/debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch +++ b/debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch @@ -1,6 +1,5 @@ -From b2553d6241a68e991e59c0a99857ae6ac21a67a8 Mon Sep 17 00:00:00 2001 -From: Ian Campbell -Date: Wed, 26 Nov 2014 15:31:50 +0000 +From: Feng Kan +Date: Wed, 4 Dec 2013 13:33:50 -0500 Subject: [PATCH 2/2] arm64: removed using of the mask attribute in the dts for reset bit. Origin: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216350.html @@ -11,10 +10,9 @@ fix minor compilation warning. Signed-off-by: Feng Kan -ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too -big to backport. -[bwh: Forward-ported to 3.19] - +[ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too + big to backport.] +[bwh: Forward-ported to 3.19. Upstream now has both drivers.] --- drivers/power/reset/xgene-reboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/patches/bugfix/mips/bpf-avoid-unreachable-code-on-little-endian.patch b/debian/patches/bugfix/mips/bpf-avoid-unreachable-code-on-little-endian.patch index 288347e3b..138d510ce 100644 --- a/debian/patches/bugfix/mips/bpf-avoid-unreachable-code-on-little-endian.patch +++ b/debian/patches/bugfix/mips/bpf-avoid-unreachable-code-on-little-endian.patch @@ -1,7 +1,7 @@ From: Aurelien Jarno Date: Fri, 4 Sep 2015 16:32:17 +0200 Subject: [1/2] MIPS: BPF: Avoid unreachable code on little endian -Origin: http://www.linux-mips.org/archives/linux-mips/2015-09/msg00040.html +Forwarded: http://www.linux-mips.org/archives/linux-mips/2015-09/msg00040.html On little endian, avoid generating the big endian version of the code by using #else in addition to #ifdef #endif. Also fix one alignment diff --git a/debian/patches/bugfix/mips/bpf-fix-build-on-pre-r2-little-endian-cpus.patch b/debian/patches/bugfix/mips/bpf-fix-build-on-pre-r2-little-endian-cpus.patch index 1b63e1bbb..fd58b1f3b 100644 --- a/debian/patches/bugfix/mips/bpf-fix-build-on-pre-r2-little-endian-cpus.patch +++ b/debian/patches/bugfix/mips/bpf-fix-build-on-pre-r2-little-endian-cpus.patch @@ -1,7 +1,7 @@ From: Aurelien Jarno Date: Sat, 5 Sep 2015 17:02:59 +0200 Subject: [2/2] MIPS: BPF: Fix build on pre-R2 little endian CPUs -Origin: http://www.linux-mips.org/archives/linux-mips/2015-09/msg00041.html +Forwarded: http://www.linux-mips.org/archives/linux-mips/2015-09/msg00041.html The rotr, seh and wsbh instructions have been introduced with the R2 ISA. Thus the current BPF code fails to build on pre-R2 little endian