Merge version 21.2.5-1+rpi1 and 21.2.6-1 to produce 21.2.6-1+rpi1

diff --cc debian/changelog
index fb1a2c340d9598dc76554227475323fbf3b97c29,d2a3215ed5707e64f00eff874fc19dd404bfa510..51ea5fc101831a71c91b53989ef6b225acae6d9e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- mesa (21.2.5-1+rpi1) bookworm-staging; urgency=medium
++mesa (21.2.6-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 20.1.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 02 Jul 2020 00:56:02 +0000]
 +  * Don't build with valgrind on armhf, the old version in Raspbian
 +    is not compatible.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Nov 2021 16:11:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Dec 2021 17:23:37 +0000
++
+ mesa (21.2.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Nov 2021 16:07:58 +0200
  
  mesa (21.2.5-1) unstable; urgency=medium