All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Boris-Chengbiao Zhou <bobo1239@web.de>,
	Finn Behrens <me@kloenk.de>, Gary Guo <gary@garyguo.net>,
	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>,
	Nathan Chancellor <nathan@kernel.org>,
	Sven Van Asbroeck <thesven73@gmail.com>,
	Wedson Almeida Filho <wedsonaf@google.com>,
	Wei Liu <wei.liu@kernel.org>, Wu XiangCheng <bobwxc@email.cn>,
	Yuki Okushi <jtitor@2k36.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree
Date: Fri, 3 Dec 2021 10:05:09 +0100	[thread overview]
Message-ID: <CANiq72nu_2s=eGy9KbOZDU8LKUw6bczP1Sea1Pewuwvue7ovdQ@mail.gmail.com> (raw)
In-Reply-To: <20211203162035.406a055a@canb.auug.org.au>

On Fri, Dec 3, 2021 at 6:20 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good to me. Thanks!

Cheers,
Miguel

  reply	other threads:[~2021-12-03  9:05 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03  5:20 linux-next: manual merge of the rust tree with the kbuild tree Stephen Rothwell
2021-12-03  9:05 ` Miguel Ojeda [this message]
  -- 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-10-15  7:24 Stephen Rothwell
2021-10-15 12:24 ` Miguel Ojeda
2021-10-28  9:09 ` Stephen Rothwell
2021-10-28 11:06   ` 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='CANiq72nu_2s=eGy9KbOZDU8LKUw6bczP1Sea1Pewuwvue7ovdQ@mail.gmail.com' \
    --to=miguel.ojeda.sandonis@gmail.com \
    --cc=alex.gaynor@gmail.com \
    --cc=ark.email@gmail.com \
    --cc=bobo1239@web.de \
    --cc=bobwxc@email.cn \
    --cc=gary@garyguo.net \
    --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=nathan@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=thesven73@gmail.com \
    --cc=wedsonaf@google.com \
    --cc=wei.liu@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.