From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Adam Bratschi-Kaye <ark.email@gmail.com>,
Alex Gaynor <alex.gaynor@gmail.com>,
Ayaan Zaidi <zaidi.ayaan@gmail.com>,
Boqun Feng <boqun.feng@gmail.com>,
Boris-Chengbiao Zhou <bobo1239@web.de>,
Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
Fox Chen <foxhlchen@gmail.com>, Gary Guo <gary@garyguo.net>,
Geoffrey Thomas <geofft@ldpreload.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Miguel Ojeda <ojeda@kernel.org>,
Sumera Priyadarsini <sylphrenadin@gmail.com>,
Sven Van Asbroeck <thesven73@gmail.com>,
Wedson Almeida Filho <wedsonaf@google.com>,
Yuki Okushi <jtitor@2k36.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree
Date: Fri, 15 Oct 2021 14:24:04 +0200 [thread overview]
Message-ID: <CANiq72mpkr9SvLytg9CY4dufJFtggbr-k64=2sJaRrAqJ3cS=g@mail.gmail.com> (raw)
In-Reply-To: <20211015182404.0355bef6@canb.auug.org.au>
Hi Stephen,
On Fri, Oct 15, 2021 at 9:24 AM Stephen Rothwell <sfr@canb.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
next prev parent reply other threads:[~2021-10-15 12:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 7:24 linux-next: manual merge of the rust tree with the kbuild tree Stephen Rothwell
2021-10-15 12:24 ` Miguel Ojeda [this message]
2021-10-28 9:09 ` Stephen Rothwell
2021-10-28 11:06 ` Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2022-09-27 18:16 broonie
2022-09-28 17:16 ` Miguel Ojeda
2022-10-04 22:23 ` Stephen Rothwell
2022-09-26 23:12 broonie
2022-09-27 12:47 ` Miguel Ojeda
2022-09-12 7:41 Stephen Rothwell
2022-08-02 23:38 broonie
2022-08-03 9:28 ` Miguel Ojeda
2022-08-14 23:08 ` Stephen Rothwell
2022-04-05 3:14 Stephen Rothwell
2022-04-05 8:33 ` Miguel Ojeda
2022-03-17 6:02 Stephen Rothwell
2022-03-17 7:11 ` Miguel Ojeda
2022-01-17 23:51 Stephen Rothwell
2021-12-07 5:13 Stephen Rothwell
2021-12-03 5:20 Stephen Rothwell
2021-12-03 9:05 ` Miguel Ojeda
2021-10-06 5:46 Stephen Rothwell
2021-08-11 7:26 Stephen Rothwell
2021-08-11 17:04 ` Nick Desaulniers
2021-08-12 6:34 ` Stephen Rothwell
2021-03-29 7:32 Stephen Rothwell
2021-03-18 4:37 Stephen Rothwell
2021-03-18 5:04 ` 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='CANiq72mpkr9SvLytg9CY4dufJFtggbr-k64=2sJaRrAqJ3cS=g@mail.gmail.com' \
--to=miguel.ojeda.sandonis@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=ark.email@gmail.com \
--cc=bobo1239@web.de \
--cc=boqun.feng@gmail.com \
--cc=d0u9.su@outlook.com \
--cc=foxhlchen@gmail.com \
--cc=gary@garyguo.net \
--cc=geofft@ldpreload.com \
--cc=jtitor@2k36.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=me@kloenk.de \
--cc=mpe@ellerman.id.au \
--cc=ojeda@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sylphrenadin@gmail.com \
--cc=thesven73@gmail.com \
--cc=wedsonaf@google.com \
--cc=zaidi.ayaan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).