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

diff --cc debian/changelog
index ac6bbb5f91aa3f0cd7c954f0904af5e989556913,c7db77a02b9f27a8247ef4e47873dacc87f36ea3..cbac85568967ea239ce43d3ed757646322c26a0d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- binutils (2.31.1-6+rpi1) buster-staging; urgency=medium
++binutils (2.31.1-7+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>  Sat, 22 Sep 2018 21:47:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 21 Oct 2018 14:54:44 +0000
++
+ binutils (2.31.1-7) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20181018).
+     - AArch64: Fix error checking for SIMD udot (by element).
+     - x86: Add Intel ENCLV to assembler and disassembler.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 18 Oct 2018 08:54:07 +0200
  
  binutils (2.31.1-6) unstable; urgency=medium