Merge version 0.3-2+rpi1 and 0.3-2+deb11u1 to produce 0.3-2+rpi1+deb11u1

diff --cc debian/changelog
index 738eae2682434a4ec00649d151018725a9f1028a,f455295d165513a39942915c2b133e529fa52d17..233d2676bf83c92063e387732339952dce2cf67f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- libbpf (0.3-2+rpi1) bullseye-staging; urgency=medium
++libbpf (0.3-2+rpi1+deb11u1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 0.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jan 2021 03:30:15 +0000]
 +  * Disable use of dmb on arm, it's not approprpriate for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 12:08:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Apr 2025 01:06:29 +0000
++
+ libbpf (0.3-2+deb11u1) bullseye-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS Team.
+   * CVE-2022-3534: use-after-free in btf_dump_name_dups()
+   * CVE-2022-3606: null-pointer dereference in find_prog_by_sec_insn()
+ 
+  -- Adrian Bunk <bunk@debian.org>  Thu, 24 Apr 2025 15:56:45 +0300
  
  libbpf (0.3-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 50cec3a112dc7ff27cddda90481378428ea85045,dc510b37766ba5a7ba612fee1240987ba576c346..e430df432e7b9a328cc0d54921df6e4badaede98
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,2 +1,3 @@@
+ 0001-libbpf-Fix-use-after-free-in-btf_dump_name_dups.patch
+ 0002-libbpf-Fix-null-pointer-dereference-in-find_prog_by_.patch
 +dont-use-dmb.patch