Merge version 2.30.90.20180710-1+rpi1 and 2.31.1-2 to produce 2.31.1-2+rpi1

diff --cc debian/changelog
index 6481c38b7576686194bb5dacc1fe49263244acaf,58a9b865d8974a15da15e1e72b58e3d85a492a8f..6ccc2c7c5ef56927f04e93d65facac5ce223708c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- binutils (2.30.90.20180710-1+rpi1) buster-staging; urgency=medium
++binutils (2.31.1-2+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>  Sun, 15 Jul 2018 21:27:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 15:52:00 +0000
++
+ binutils (2.31.1-2) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180726).
+     - S/390: Set the htm flag on PPA.
+     - x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed.
+     - x86: Split vcvtps2{,u}qq and vcvttps2{,u}qq.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 26 Jul 2018 12:23:07 +0200
+ 
+ binutils (2.31.1-1) unstable; urgency=medium
+ 
+   * Binutils 2.31.1 release.
+   * Remove the riscv64 build hack. Closes: #903857.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 18 Jul 2018 11:58:00 +0200
+ 
+ binutils (2.31-1) unstable; urgency=medium
+ 
+   * Binutils 2.31 release.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 16 Jul 2018 11:40:18 +0200
  
  binutils (2.30.90.20180710-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge