linux-kernel - Re: linux-next: manual merge of the rust tree with the mm 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CANiq72mPv2bKA5_MGGdOAi7rdGs+5P892JwvXAn+JbeFoMkRDA@mail.gmail.com>
Date: Tue, 12 Mar 2024 11:52:54 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Miguel Ojeda <ojeda@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Nathan Chancellor <nathan@...nel.org>
Subject: Re: linux-next: manual merge of the rust tree with the mm tree

On Mon, Mar 11, 2024 at 10:53 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Mon, 29 Jan 2024 13:33:52 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > 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.

Thanks Stephen -- the resolution is correct in next-20240312.

(The one above in January's quote is the previous resolution, i.e.
before we had the second update to the version in rust-next).

Cheers,
Miguel