Hi all,
On Mon, 29 Jan 2024 13:33:52 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> Documentation/process/changes.rst
>
> between commit:
>
> 3d21fad38152 ("kbuild: raise the minimum supported version of LLVM to 13.0.1")
>
> from the mm-non-mm-unstable branch of the mm tree and commit:
>
> c5fed8ce6549 ("rust: upgrade to Rust 1.75.0")
>
> from the rust 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 d7306b8cad13,eab7e2f8c196..000000000000
> --- a/Documentation/process/changes.rst
> +++ b/Documentation/process/changes.rst
> @@@ -30,8 -30,8 +30,8 @@@ you probably needn't concern yourself w
> Program Minimal version Command to check the version
> ====================== =============== ========================================
> GNU C 5.1 gcc --version
> -Clang/LLVM (optional) 11.0.0 clang --version
> +Clang/LLVM (optional) 13.0.1 clang --version
> - Rust (optional) 1.74.1 rustc --version
> + Rust (optional) 1.75.0 rustc --version
> bindgen (optional) 0.65.1 bindgen --version
> GNU make 3.82 make --version
> bash 4.2 bash --version
This is now a conflict between the mm-nonmm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpuJzbmnfI1v.pgp
Description: OpenPGP digital signature
