Manual merge of version 5.1.17-4+rpi1 and 5.1.17-7 to produce 5.1.17-7+rpi1

diff --cc debian/changelog
index cf2fe9980704315b610dc164dfae8a290cf98d83,7b5983a6abd796082131e84ad67d4c4033f8456d..384a325cb0a7f99e6804801b0d0b20e983f4fd4d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,29 @@@
- supermin (5.1.17-4+rpi1) stretch-staging; urgency=medium
++supermin (5.1.17-7+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
 +  * Build-depend on raspbian kernel rather than debian armmp kernel.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Nov 2016 17:01:01 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Jan 2017 10:42:04 +0000
++
+ supermin (5.1.17-7) unstable; urgency=medium
+ 
+   * Introduce alternative kernel build-dependency (Closes: #851970)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 22 Jan 2017 15:39:12 +0100
+ 
+ supermin (5.1.17-6) unstable; urgency=medium
+ 
+   * Fix build dependency for determining Built-Using (Closes: #850974)
+   
+  -- Hilko Bengen <bengen@debian.org>  Wed, 11 Jan 2017 19:53:12 +0100
+ 
+ supermin (5.1.17-5) unstable; urgency=medium
+ 
+   * Remove links from febootstrap package (Closes: #850635)
+   * Remove old NEWS, TODO items from debian/
+   * Tweak Built-Using in an attempt to fix FTBFS on alpha
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 09 Jan 2017 23:44:14 +0100
  
  supermin (5.1.17-4) unstable; urgency=medium
  

diff --cc debian/control
index d49280400a657866814297ec252022cb8ea5665f,5181d37176910a469fba19d9f58859812955361b..f860ac58d8a5cd0a8546748a2e4aa0eec24d8700
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,8 -15,8 +15,8 @@@ Build-Depends: debhelper (>= 9)
   musl-tools [amd64 arm64 armel armhf i386 mips mips64el mipsel],
   augeas-tools, libhivex-bin, 
   linux-image-alpha-generic [alpha],
-  linux-image-versatile [armel],
+  linux-image-marvell [armel] | linux-image-versatile [armel],
 - linux-image-armmp [armhf],
 + linux-image-rpi [armhf],
   linux-image-arm64 [arm64],
   linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel],
   linux-image-5kc-malta [mips64 mips64el],