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 for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 5 Nov 2021 07:31:49 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
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

Hi Miguel,

On Thu, 4 Nov 2021 13:19:22 +0100 Miguel Ojeda <miguel.ojeda.sandonis@...il.com> wrote:
>
> On Wed, Nov 3, 2021 at 10:01 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Oops, sorry about that.  I have added it back from today.  
> 
> No worries! By the way, I will be rebasing soon to fix a build error
> that happened due to some changes in mainline, so the conflict will
> disappear.

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).

> > BTW, are you intending to submit the rust tree this merge window?  
> 
> That was the idea, but a few things need to be taken care of before.
> In any case, I was told to start submitting it every couple weeks or
> so, so I think Linus et. al. do not mind if it aligns to a merge
> window or not (though I might be wrong...).

Much better to do it in the merge window.  Linus almost never takes new
features outside a merge window (but you could always ask him).

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ