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

Message-ID: <CANiq72=Pgts+RmQ3f1UzOG-o_MrS=CnJaLAaDU1UGDr2OUOWRw@mail.gmail.com>
Date:   Fri, 5 Nov 2021 12:00:44 +0100
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Andrii Nakryiko <andrii@...nel.org>,
        Antonio Terceiro <antonio.terceiro@...aro.org>,
        Boqun Feng <boqun.feng@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Daniel Xu <dxu@...uu.xyz>,
        Dariusz Sosnowski <dsosnowski@...snowski.pl>,
        Douglas Su <d0u9.su@...look.com>, Finn Behrens <me@...enk.de>,
        Gary Guo <gary@...yguo.net>, Jiri Olsa <jolsa@...nel.org>,
        Jiri Olsa <jolsa@...hat.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>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>
Subject: Re: linux-next: manual merge of the rust tree with Linus' tree

On Thu, Nov 4, 2021 at 9:31 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> I would suggest that you don't rebase if you are intending to submit to
> Linus.  Instead, do a test merge with his tree and fix the issue in the
> merge and test that, then explain it all the in the pull request (but
> ask him to pull your tree without the merge).

Note that I am still submitting this as patches, not as a PR. After we
are in, yes, of course!

Cheers,
Miguel