Merge version 21.3.7-1+rpi1 and 21.3.8-1 to produce 21.3.8-1+rpi1

diff --cc debian/changelog
index ca1ff9785e37efd0cf12e66645ae93c9215c0932,80dcbd06793066805997c4d50df3ccbc23b66e93..612ae08de62adf19ce62ded715f8561c42e46e53
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- mesa (21.3.7-1+rpi1) bookworm-staging; urgency=medium
++mesa (21.3.8-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>  Tue, 08 Mar 2022 20:25:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 15:05:52 +0000
++
+ mesa (21.3.8-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * rules: Drop kmsro option, which was removed upstream.
+   * install: Add radv defaults dri conf.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 10 Apr 2022 10:18:19 +0300
  
  mesa (21.3.7-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge