[linux] 02/03: Drop another obsolete patch for X-Gene

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit e97c31826465fb0e816004bc616a938a7ecffc44
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Dec 14 14:21:49 2015 +0000

    Drop another obsolete patch for X-Gene
    
    The xgene-reboot driver is now unused.
---
 debian/changelog                                   |  2 +-
 ...ed-using-of-the-mask-attribute-in-the-dts.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62ad8f4..6512716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ linux (4.4~rc5-1~exp1) UNRELEASED; urgency=medium
   * New upstream release candidate
 
   [ Ben Hutchings ]
-  * [arm64] Drop now-redundant patch for X-Gene device tree (fixes FTBFS)
+  * [arm64] Drop now-redundant patches for X-Gene (fixes FTBFS)
   * [s390x] udeb: Add crc-modules package (fixes FTBFS)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Dec 2015 02:51:03 +0000
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
deleted file mode 100644
index 114b727..0000000
--- a/debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Feng Kan <fkan at apm.com>
-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
-
-Remove the use of the mask attribute from original reboot driver. The use
-of the mask attribute provided unneeded complexity and security risk. Also
-fix minor compilation warning.
-
-Signed-off-by: Feng Kan <fkan at apm.com>
-
-[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(-)
-
---- a/drivers/power/reset/xgene-reboot.c
-+++ b/drivers/power/reset/xgene-reboot.c
-@@ -74,8 +74,7 @@ static int xgene_reboot_probe(struct pla
- 		return -ENODEV;
- 	}
- 
--	if (of_property_read_u32(dev->of_node, "mask", &ctx->mask))
--		ctx->mask = 0xFFFFFFFF;
-+	ctx->mask = 0x1;
- 
- 	ctx->dev = dev;
- 	ctx->restart_handler.notifier_call = xgene_restart_handler;
diff --git a/debian/patches/series b/debian/patches/series
index 5eea42f..75705f4 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-removed-using-of-the-mask-attribute-in-the-dts.patch
 
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git