diff --git a/debian/changelog b/debian/changelog index 1b92be8a3..fcbafd23c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (4.4~rc4-1~exp2) UNRELEASED; urgency=medium + + * [arm64] Drop now-redundant patch for X-Gene device tree (fixes FTBFS) + + -- Ben Hutchings Mon, 14 Dec 2015 02:51:03 +0000 + linux (4.4~rc4-1~exp1) experimental; urgency=medium * New upstream release candidate 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 deleted file mode 100644 index 41512dfab..000000000 --- a/debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -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. 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(+) - ---- a/arch/arm64/boot/dts/apm/apm-storm.dtsi -+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi -@@ -480,6 +480,11 @@ - interrupts = <0x0 0x4c 0x4>; - }; - -+ reboot@17000014 { -+ compatible = "apm,xgene-reboot"; -+ reg = <0x0 0x17000014 0x0 0x4>; -+ }; -+ - serial1: serial@1c021000 { - status = "disabled"; - device_type = "serial"; diff --git a/debian/patches/series b/debian/patches/series index 1129ccfb9..5eea42fd9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,7 +44,6 @@ debian/snd-pcsp-disable-autoload.patch bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch # Arch bug fixes -bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch # Arch features