Merge version 2:4.22.3+dfsg-4+rpi1 and 2:4.22.4+dfsg-1~deb13u1 to produce 2:4.22...

diff --cc debian/changelog
index e75be2ebe648dd972385dc77ff1f3b94f50d9a0b,e2a0697a4e9920df66aded3a9b59cb7d14f14200..47060cbf8a9cc260535b5512eff53183f13e8088
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,43 @@@
- samba (2:4.22.3+dfsg-4+rpi1) trixie-staging; urgency=medium
++samba (2:4.22.4+dfsg-1~deb13u1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2:4.19.1+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Oct 2023 15:37:21 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 10:32:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 13 Sep 2025 18:51:55 +0000
++
+ samba (2:4.22.4+dfsg-1~deb13u1) trixie; urgency=medium
+ 
+   * new upstream stable/bugfix release:
+    - https://bugzilla.samba.org/show_bug.cgi?id=14981:
+      netr_LogonSamLogonEx returns NR_STATUS_ACCESS_DENIED with SysvolReady=0
+    - https://bugzilla.samba.org/show_bug.cgi?id=15663:
+      Apparently there is a conflict between shadow_copy2 module
+      and virusfilter (action quarantine)
+    - https://bugzilla.samba.org/show_bug.cgi?id=15816:
+      vfs_streams_depot fstatat broken
+    - https://bugzilla.samba.org/show_bug.cgi?id=15840:
+      kinit command is failing with Missing cache Error
+    - https://bugzilla.samba.org/show_bug.cgi?id=15844:
+      getpwuid does not shift to new DC when current DC is down
+    - https://bugzilla.samba.org/show_bug.cgi?id=15876:
+      Windows security hardening locks out schannel'ed
+      netlogon dc calls like netr_DsRGetDCName
+    - https://bugzilla.samba.org/show_bug.cgi?id=15877:
+      Fix handling of empty GPO link
+    - https://bugzilla.samba.org/show_bug.cgi?id=15880:
+      SMB ACL inheritance doesn't work for files created
+    - https://bugzilla.samba.org/show_bug.cgi?id=15881:
+      Unresponsive second DC can cause idmapping failure when using idmap_ad
+      (was libads-fix-get_kdc_ip_string.patch)
+    - https://bugzilla.samba.org/show_bug.cgi?id=15891:
+      Figuring out the DC name from IP address fails
+      and breaks fork_domain_child()
+    - https://bugzilla.samba.org/show_bug.cgi?id=15892:
+      Delayed leader broadcast can block ctdb forever
+   * libads-fix-get_kdc_ip_string.patch: remove, included upstream
+   * d/gbp.conf: debian-branch=debian/4.22
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Thu, 21 Aug 2025 20:37:38 +0300
  
  samba (2:4.22.3+dfsg-4) unstable; urgency=medium