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

diff --cc debian/changelog
index c1bfb311f9d764a8a917902b1828fdc87e3d6eda,a418f5ad01b51f803ffb49e0e5309c3e46b93bc2..ac6bbb5f91aa3f0cd7c954f0904af5e989556913
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- binutils (2.31.1-5+rpi1) buster-staging; urgency=medium
++binutils (2.31.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>  Mon, 03 Sep 2018 00:22:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 22 Sep 2018 21:47:01 +0000
++
+ binutils (2.31.1-6) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180919).
+     - PR ld/23499: elf: Check for corrupt symbol version info.
+     - Fix Aarch64 bug in warning filtering.
+     - Improve the code in the assembler to detect and reject a duplicate
+       input and output file.
+   * Don't reset CROSS_ARCHS when building in an autopkg tests (as done by
+     the cross-toolchain-base build test).
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 19 Sep 2018 13:48:13 +0200
  
  binutils (2.31.1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge