Merge version 2.38.90.20220713-2+rpi1 and 2.39-3 to produce 2.39-3+rpi1

diff --cc debian/changelog
index 36996d1adc61ecefb401264485c02af0a9b68422,ebafd7ed2431fc7fde1a6d505a4a0414d77bb5a5..dfdfc9ddc7d804d081fb7dcfdbbacc0876882d87
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,16 +1,40 @@@
- binutils (2.38.90.20220713-2+rpi1) bookworm-staging; urgency=medium
++binutils (2.39-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
 +  [changes brought forward from 2.31.1-16+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 06 Feb 2020 17:10:11 +0000]
 +  * Allow dependency of binutils on binutils-triplet to be satisfied by
 +    foreign architectures, to facilitate setting up environments where the
 +    linker is 64-bit while everything else is 32-bit.
 +
 +  [changes brought forward from 2.35-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 18:10:17 +0000]
 +  * Build sufficient cross binutils to support u-boot build.
 +
 +  [changes brought forward from 2.35.1-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 01 Dec 2020 21:55:01 +0000]
 +  * Build the same set of cross-binutils on arm64 as on armhf.
 +    (avoids issues when control is generated on armhf and then package is
 +    built on arm64)
 +  * Remove <!nocheck> build-depends as testsuite is disabled.
 +
 +  [changes brought forward from 2.37.90.20220130-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Feb 2022 12:05:47 +0000]
 +  * Apply patch proposed upstream to fix glibc link issue.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 23 Jul 2022 08:40:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 27 Sep 2022 05:01:25 +0000
++
+ binutils (2.39-3) unstable; urgency=medium
+ 
+   * Ignore two failing tests on amd64, sh4 and x32, some more on hurd-i386.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 24 Sep 2022 14:22:36 +0200
+ 
+ binutils (2.39-1) unstable; urgency=medium
+ 
+   * binutils 2.39 release.
+   * Update from the binutils 2.39 branch:
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 23 Sep 2022 16:40:37 +0200
  
  binutils (2.38.90.20220713-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge

diff --cc debian/patches/series
index 3b704dce171bb74e699886a74f8e783c0a1a7b65,50c0ec1e5d3b659dd09e3d3849c417db95e60179..83f9b4954470fb6d49981b4ffe7d710baa3cc89b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -17,8 -24,16 +19,7 @@@ aarch64-libpath.dif
  mips64-default-n64.diff
  gold-mips.diff
  gold-no-keep-files-mapped.diff
 -
 -# trunk backports
 -
 -# experimental ...
 -#infinity-notes.diff
  libctf-soname.diff
 -
  mips-hack.diff
- pr29338.diff
 -
 -#aarch64-copy-reloc-revert-0.diff
 -#aarch64-copy-reloc-revert-1.diff
 -#aarch64-copy-reloc-revert-2.diff
 +fix-glibc-link-assertion.patch
 +auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965

diff --cc debian/rules
Simple merge