Merge version 5.11.0-7+rpi1 and 5.12.0-3 to produce 5.12.0-3+rpi1

diff --cc debian/changelog
index e9fa332554beab7bad92719cae0a4137b46c45b8,471b49021d9947b1dca9e13242bf78666874c553..4de191639c7a98685beaca8346c48f5fae9903ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,32 @@@
- collectd (5.11.0-7+rpi1) bullseye-staging; urgency=medium
++collectd (5.12.0-3+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 5.11.0-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 14:58:41 +0000]
 +  * Use libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Sep 2020 14:58:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jan 2021 22:06:27 +0000
++
+ collectd (5.12.0-3) unstable; urgency=medium
+ 
+   * [e0f135d] Actually fix the last upload.
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Sun, 20 Dec 2020 13:06:54 +0100
+ 
+ collectd (5.12.0-2) unstable; urgency=medium
+ 
+   * [1497198] Smart is broken on some architectures.
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Sat, 19 Dec 2020 01:20:16 +0100
+ 
+ collectd (5.12.0-1) unstable; urgency=medium
+ 
+   * [6003e65] Updating debian/watch file
+   * [5504abd] Update upstream source from tag 'upstream/5.12.0'
+     Update to upstream version '5.12.0'
+     with Debian dir 6ec21ce26138afb993ce3ef5011c207506c64066
+   * [63e30b4] Refreshing patches
+   * [fe7e50f] Disable netstat_udp on !freebsd
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Mon, 07 Dec 2020 21:35:49 +0100
  
  collectd (5.11.0-7) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge