diff -u mesa-21.2.6/debian/changelog mesa-21.2.6/debian/changelog
--- mesa-21.2.6/debian/changelog
+++ mesa-21.2.6/debian/changelog
@@ -1,3 +1,11 @@
+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, 02 Dec 2021 17:23:37 +0000
+
 mesa (21.2.6-1) unstable; urgency=medium
 
   * New upstream release.
diff -u mesa-21.2.6/debian/control mesa-21.2.6/debian/control
--- mesa-21.2.6/debian/control
+++ mesa-21.2.6/debian/control
@@ -50,7 +50,9 @@
  wayland-protocols (>= 1.9),
  zlib1g-dev,
  libglvnd-dev (>= 1.3.2),
- valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x],
+ valgrind [amd64 arm64 i386 mips64el mipsel powerpc ppc64 ppc64el s390x],
+Build-Conflicts:
+ valgrind [armhf]
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
 Homepage: https://mesa3d.org/
diff -u mesa-21.2.6/debian/rules mesa-21.2.6/debian/rules
--- mesa-21.2.6/debian/rules
+++ mesa-21.2.6/debian/rules
@@ -93,7 +93,7 @@
 	# hurd also lacks *_CLOEXEC
 	EGL_PLATFORMS += ,wayland
 
-	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x))
+	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 mips64el mipsel powerpc ppc64 ppc64el s390x))
 		confflags_VALGRIND += -Dvalgrind=enabled
 	endif