Merge version 2.31-10+rpi1 and 2.31-11 to produce 2.31-11+rpi1

diff --cc debian/changelog
index 2b98dfda28eb49bf4ca4f4b4427ddc169d166c0b,708917efe75596bcde5f7f8e8d53b791979e9669..bbec1dbd85d8821428bdd7ef12018c62a87e447e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- glibc (2.31-10+rpi1) bullseye-staging; urgency=medium
++glibc (2.31-11+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 2.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Mar 2021 21:55:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Apr 2021 12:18:08 +0000
++
+ glibc (2.31-11) unstable; urgency=medium
+ 
+   * debian/debhelper.in/libc.preinst: handle the case where debconf
+     configuration has never been done.  Closes: #986180.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Wed, 31 Mar 2021 22:09:32 +0200
  
  glibc (2.31-10) unstable; urgency=medium