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] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 15 Oct 2021 14:24:04 +0200
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Masahiro Yamada <masahiroy@...nel.org>,
        Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Ayaan Zaidi <zaidi.ayaan@...il.com>,
        Boqun Feng <boqun.feng@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Douglas Su <d0u9.su@...look.com>, Finn Behrens <me@...enk.de>,
        Fox Chen <foxhlchen@...il.com>, Gary Guo <gary@...yguo.net>,
        Geoffrey Thomas <geofft@...reload.com>,
        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>,
        Sumera Priyadarsini <sylphrenadin@...il.com>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>,
        Yuki Okushi <jtitor@...6.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree

Hi Stephen,

On Fri, Oct 15, 2021 at 9:24 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Miguel,  it might be worth do a back merge of v5.14 (or maybe even
> v5.15-rc1) to fix up the old conflicts ... If you do that, though,
> please don't use github's GUI to do it, do it in your own git tree,
> include a good commit message in the merge commit (saying why you did
> the merge), and push it up to git hub.

Yeah, the last release has been rough on conflicts. I will move the
new code to rust-next for your Monday run (based onto -rc5) -- there
has been some changes since last time and I already have it in sync in
our internal branch. Thanks for keeping up with all the conflicts!

As for GitHub, thanks for the warning! We only use the GUI for
internal development only; for the -next branch I prepare it manually.
I will also rearrange things to follow a normal kernel process when we
hit mainline.

Cheers,
Miguel

Powered by blists - more mailing lists