Merge version 2.4.120-1+rpi1 and 2.4.120-2 to produce 2.4.120-2+rpi1

diff --cc debian/changelog
index 7f2e4dda56e5a3b0e40920b0c828eedcc8cfbd50,c4d1ff6e55020e04b0a02e23f2098605401ebead..2b5c899ec010e0810412bab7c3bbfa20c68c15e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- libdrm (2.4.120-1+rpi1) trixie-staging; urgency=medium
++libdrm (2.4.120-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.4.74-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 28 Jun 2017 21:14:42 +0000]
 +  * Move valgrind to build-conflicts, the old version in raspbian breaks the build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2024 00:02:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2024 20:42:16 +0000
++
+ libdrm (2.4.120-2) unstable; urgency=medium
+ 
+   * control: Drop libatomic-ops-dev from build-depends again, as we can
+     continue using atomic ops provided by gcc.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 08 Feb 2024 10:34:49 +0200
  
  libdrm (2.4.120-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge