Merge version 2.26-4+rpi1 and 2.26-6 to produce 2.26-6+rpi1

diff --cc debian/changelog
index 8308d7a8649a522d02da78243e801da59ea00843,46333f7bfcdb6640095e99f9c9ab178df703cfc8..3feae6d155e406eca4e63371db9c823c21b04c8a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,37 @@@
- glibc (2.26-4+rpi1) buster-staging; urgency=medium
++glibc (2.26-6+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Jan 2018 03:33:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 15 Feb 2018 17:11:43 +0000
++
+ glibc (2.26-6) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix build with binutils 2.30 on arm64.  Closes: #888477.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Fri, 26 Jan 2018 23:35:29 +0100
+ 
+ glibc (2.26-5) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/patches/any/local-cudacc-float128.diff: Disable _Float128 for icc
+     too.
+ 
+   [ Aurelien Jarno ]
+   * debian/control.in/libc: set the priority of the libc{0.1,0.3,0.6} packages
+     to optional following the changes on the ftp-master side (see bug#846982).
+   * debian/control.in/libc: build-depends on gcc-7 (>= 7.2.0-20) on amd64, i386
+     and x32 to avoid a missed optimization causing SSE registers to be pushed
+     on the stack.  Closes: #886447.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - debian/patches/hurd-i386/git-mount_namespace.diff: upstreamed.
+   * debian/testsuite-xfail-debian.mk: update with new tests.
+   * debian/debhelper.in/libc.NEWS: note that the minimum required Linux kernel
+     is now 3.2 to avoid aborts in the middle of an upgrade.  Closes: #888183.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 23 Jan 2018 22:51:51 +0100
  
  glibc (2.26-4) unstable; urgency=medium