From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Miguel Ojeda <ojeda@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nathan Chancellor <nathan@kernel•org>
Subject: Re: linux-next: manual merge of the rust tree with the mm tree
Date: Tue, 12 Mar 2024 08:53:01 +1100 [thread overview]
Message-ID: <20240312085301.66009b5f@canb.auug.org.au> (raw)
In-Reply-To: <20240129133352.25a3ee19@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1915 bytes --]
Hi all,
On Mon, 29 Jan 2024 13:33:52 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-03-11 21:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 2:33 linux-next: manual merge of the rust tree with the mm tree Stephen Rothwell
2024-03-11 21:53 ` Stephen Rothwell [this message]
2024-03-12 10:52 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240312085301.66009b5f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nathan@kernel$(echo .)org \
--cc=ojeda@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox