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

diff --cc debian/changelog
index 42143417f83bd5b60f1ece50ec4b5cba788b9f85,3b82679d365380257ab2de8ac24a60f27df981cb..16c0e17cb494a0685f075fb4c88cc604d5a204bf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- gcc-11 (11.4.0-6+rpi1) trixie-staging; urgency=medium
++gcc-11 (11.4.0-7+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from gcc-8 8-20180207-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Feb 2018 00:20:23 +0000]
 +  * Don't pass -march=armv7+fp to compiler when building libatomic.
 +
 +  [changes introduced in gcc-8 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Dec 2023 22:31:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Dec 2023 01:37:37 +0000
++
+ gcc-11 (11.4.0-7) unstable; urgency=medium
+ 
+   * Update to git 20231215 from the gcc-11 branch.
+     - Fix PR target/112891 (x86).
+   * For Ubuntu 24.04 LTS and later, switch _FORTIFY_SOURCE to 3 by default
+     instead of 2 when optimization is enabled.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 15 Dec 2023 09:25:37 +0100
  
  gcc-11 (11.4.0-6) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge