linux-kernel - linux-next: manual merge of the kbuild tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20221007051628.004a89d4@canb.auug.org.au>
Date:   Fri, 7 Oct 2022 05:16:28 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Daniel Xu <dxu@...uu.xyz>, Finn Behrens <me@...enk.de>,
        Gary Guo <gary@...yguo.net>, Julian Merkle <me@...erkle.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Ellerman <mpe@...erman.id.au>,
        Miguel Ojeda <ojeda@...nel.org>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>,
        Wei Liu <wei.liu@...nel.org>, Wu XiangCheng <bobwxc@...il.cn>,
        Yuki Okushi <jtitor@...6.org>
Subject: linux-next: manual merge of the kbuild tree with Linus' tree

Hi all,

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

  Documentation/process/changes.rst

between commit:

  d07479b211b7 ("docs: add Rust documentation")

from Linus' tree and commit:

  0715fdb03e2c ("docs: bump minimal GNU Make version to 3.82")

from the kbuild 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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/process/changes.rst
index 9a90197989dd,26a7fd875cfa..000000000000
--- a/Documentation/process/changes.rst
+++ b/Documentation/process/changes.rst
@@@ -31,9 -31,7 +31,9 @@@ you probably needn't concern yourself w
  ====================== ===============  ========================================
  GNU C                  5.1              gcc --version
  Clang/LLVM (optional)  11.0.0           clang --version
 +Rust (optional)        1.62.0           rustc --version
 +bindgen (optional)     0.56.0           bindgen --version
- GNU make               3.81             make --version
+ GNU make               3.82             make --version
  bash                   4.2              bash --version
  binutils               2.23             ld -v
  flex                   2.5.35           flex --version

Content of type "application/pgp-signature" skipped