From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 1 Mar 2018 00:03:02 +0000 (+0000)
Subject: Merge version 6.3.0-18+rpi1 and 6.3.0-18+deb9u1 to produce 6.3.0-18+rpi1+deb9u1
X-Git-Tag: raspbian/6.3.0-18+rpi1+deb9u1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70771556aa7d2d9335c58b98369cf8caa66556e3;p=gcc-6.git

Merge version 6.3.0-18+rpi1 and 6.3.0-18+deb9u1 to produce 6.3.0-18+rpi1+deb9u1
---

4d052c05a4b72ef6dbe3205fd94818ecab2c9c78
diff --cc debian/changelog
index 635ded4,c17fe86..ec9ea46
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- gcc-6 (6.3.0-18+rpi1) stretch-staging; urgency=medium
++gcc-6 (6.3.0-18+rpi1+deb9u1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 11 May 2016 20:56:09 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Jun 2017 13:33:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Mar 2018 00:03:02 +0000
++
+ gcc-6 (6.3.0-18+deb9u1) stretch-security; urgency=medium
+ 
+   * Backport of retpoline support by HJ Lu
+ 
+  -- Moritz Muehlenhoff <jmm@debian.org>  Wed, 14 Feb 2018 17:53:20 +0100
  
  gcc-6 (6.3.0-18) unstable; urgency=medium