From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
Alex Gaynor <alex.gaynor@gmail.com>,
Ayaan Zaidi <zaidi.ayaan@gmail.com>,
Boris-Chengbiao Zhou <bobo1239@web.de>,
Finn Behrens <me@kloenk.de>, Gary Guo <gary@garyguo.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Mike Leach <mike.leach@linaro.org>,
Sven Van Asbroeck <thesven73@gmail.com>,
Wedson Almeida Filho <wedsonaf@google.com>
Subject: Re: linux-next: manual merge of the rust tree with the coresight tree
Date: Tue, 30 Nov 2021 11:00:02 +0100 [thread overview]
Message-ID: <CANiq72kSkv3f9xJ7BMQoTo4DmiGwwW7nMSnwvTeLnuLDQfK1Wg@mail.gmail.com> (raw)
In-Reply-To: <20211130140621.29261096@canb.auug.org.au>
On Tue, Nov 30, 2021 at 4:06 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.
ACK -- looks good to me. Thanks!
Cheers,
Miguel
next prev parent reply other threads:[~2021-11-30 10:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 3:06 linux-next: manual merge of the rust tree with the coresight tree Stephen Rothwell
2021-11-30 10:00 ` Miguel Ojeda [this message]
2021-11-30 19:56 ` Mathieu Poirier
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=CANiq72kSkv3f9xJ7BMQoTo4DmiGwwW7nMSnwvTeLnuLDQfK1Wg@mail.gmail.com \
--to=miguel.ojeda.sandonis@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=bobo1239@web.de \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=me@kloenk.de \
--cc=mike.leach@linaro.org \
--cc=ojeda@kernel.org \
--cc=sfr@canb.auug.org.au \
--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).