linux-next: manual merge of the jc_docs tree with the rust tree

[Mark Brown]

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/process/changes.rst

between commits:

  254c422f2f1e0 ("rust: bump Rust minimum supported version to 1.85.0 (Debian Trixie)")
  a032c07f00fc4 ("rust: bump `bindgen` minimum supported version to 0.71.1 (Debian Trixie)")

from the rust tree and commit:

  ece7e57afd51e ("docs: changes.rst and ver_linux: sort the lists")

from the jc_docs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc Documentation/process/changes.rst
index 84156d0313659,adbd52869458d..0000000000000
--- a/Documentation/process/changes.rst
+++ b/Documentation/process/changes.rst
@@@ -29,40 -30,41 +30,41 @@@ you probably do not need to concern you
  ====================== ===============  ========================================
          Program        Minimal version       Command to check the version
  ====================== ===============  ========================================
- GNU C                  8.1              gcc --version
- Clang/LLVM (optional)  15.0.0           clang --version
- Rust (optional)        1.85.0           rustc --version
- bindgen (optional)     0.71.1           bindgen --version
- GNU make               4.0              make --version
  bash                   4.2              bash --version
- binutils               2.30             ld -v
- flex                   2.5.35           flex --version
- bison                  2.0              bison --version
- pahole                 1.22             pahole --version
- util-linux             2.10o            mount --version
- kmod                   13               depmod -V
- e2fsprogs              1.41.4           e2fsck -V
- jfsutils               1.1.3            fsck.jfs -V
- xfsprogs               2.6.0            xfs_db -V
- squashfs-tools         4.0              mksquashfs -version
- btrfs-progs            0.18             btrfs --version
- pcmciautils            004              pccardctl -V
- quota-tools            3.09             quota -V
- PPP                    2.4.0            pppd --version
- nfs-utils              1.0.5            showmount --version
- procps                 3.2.0            ps --version
- udev                   081              udevd --version
- grub                   0.93             grub --version || grub-install --version
- mcelog                 0.6              mcelog --version
- iptables               1.4.2            iptables -V
- openssl & libcrypto    1.0.0            openssl version
  bc                     1.06.95          bc --version
- Sphinx\ [#f1]_         3.4.3            sphinx-build --version
 -bindgen (optional)     0.65.1           bindgen --version
++bindgen (optional)     0.71.1           bindgen --version
+ binutils               2.30             ld -v
+ bison                  2.0              bison --version
+ btrfs-progs            0.18             btrfs --version
+ Clang/LLVM (optional)  15.0.0           clang --version
+ e2fsprogs              1.41.4           e2fsck -V
+ flex                   2.5.35           flex --version
+ gdb                    7.2              gdb --version
+ GNU awk (optional)     5.1.0            gawk --version
+ GNU C                  8.1              gcc --version
+ GNU make               4.0              make --version
  GNU tar                1.28             tar --version
+ GRUB                   0.93             grub --version || grub-install --version
  gtags (optional)       6.6.5            gtags --version
+ iptables               1.4.2            iptables -V
+ jfsutils               1.1.3            fsck.jfs -V
+ kmod                   13               kmod -V
+ mcelog                 0.6              mcelog --version
  mkimage (optional)     2017.01          mkimage --version
+ nfs-utils              1.0.5            showmount --version
+ openssl & libcrypto    1.0.0            openssl version
+ pahole                 1.22             pahole --version
+ pcmciautils            004              pccardctl -V
+ PPP                    2.4.0            pppd --version
+ procps                 3.2.0            ps --version
  Python                 3.9.x            python3 --version
- GNU AWK (optional)     5.1.0            gawk --version
+ quota-tools            3.09             quota -V
 -Rust (optional)        1.78.0           rustc --version
++Rust (optional)        1.85.0           rustc --version
+ Sphinx\ [#f1]_         3.4.3            sphinx-build --version
+ squashfs-tools         4.0              mksquashfs -version
+ udev                   081              udevadm --version
+ util-linux             2.10o            mount --version
+ xfsprogs               2.6.0            xfs_db -V
  ====================== ===============  ========================================
  
  .. [#f1] Sphinx is needed only to build the Kernel documentation

Attachment: signature.asc
Description: PGP signature