Merge version 2.29.1-5+rpi1 and 2.29.1-6 to produce 2.29.1-6+rpi1

diff --cc debian/changelog
index 6e4adb9c799433acf1b54a8efefe4b8256fa7fab,9453d64f37a2dcc50946b1abbc3de523b6adb24d..11b7ac8491c53518109b6877e87042e56146d7f4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- binutils (2.29.1-5+rpi1) buster-staging; urgency=medium
++binutils (2.29.1-6+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Oct 2017 00:47:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2017 17:56:24 +0000
++
+ binutils (2.29.1-6) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171022.
+     - [GOLD] Fix powerpc64 optimization of TOC accesses.
+   * Do the extra/optional dance ...
+   * Build debug packages. Closes: #863728.
+   * Fix stripping the binutils-<native triplet> packages.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 22 Oct 2017 22:41:34 +0200
  
  binutils (2.29.1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge