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>, Finn Behrens <me@kloenk.de>,
Geoffrey Thomas <geofft@ldpreload.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Wedson Almeida Filho <wedsonaf@google.com>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree
Date: Thu, 18 Mar 2021 06:04:44 +0100 [thread overview]
Message-ID: <CANiq72k1uL3MdebRtck-EODx2YnucOAb-7hb1zzWy-L7UAwxcQ@mail.gmail.com> (raw)
In-Reply-To: <20210318153735.691c9c37@canb.auug.org.au>
On Thu, Mar 18, 2021 at 5:37 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below - I think I got this right ...) 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.
Yeah, the TENTATIVE_CLANG_FLAGS is the workaround to support GCC I
mentioned privately. It is unfortunate that particular bit was the one
that had to give you a conflict... :-)
Longer-term, Masahiro et. al. may have better ideas on how to do the
whole trick in a cleaner way (kbuild folks: don't worry, our branch is
not going to be merged just yet ;-)
Cheers,
Miguel
next prev parent reply other threads:[~2021-03-18 5:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 4:37 linux-next: manual merge of the rust tree with the kbuild tree Stephen Rothwell
2021-03-18 5:04 ` Miguel Ojeda [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-29 7:32 Stephen Rothwell
2021-08-11 7:26 Stephen Rothwell
2021-08-11 17:04 ` Nick Desaulniers
2021-08-12 6:34 ` Stephen Rothwell
2021-10-06 5:46 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-12-03 5:20 Stephen Rothwell
2021-12-03 9:05 ` Miguel Ojeda
2021-12-07 5:13 Stephen Rothwell
2022-01-17 23:51 Stephen Rothwell
2022-03-17 6:02 Stephen Rothwell
2022-03-17 7:11 ` Miguel Ojeda
2022-04-05 3:14 Stephen Rothwell
2022-04-05 8:33 ` Miguel Ojeda
2022-08-02 23:38 broonie
2022-08-03 9:28 ` Miguel Ojeda
2022-08-14 23:08 ` Stephen Rothwell
2022-09-12 7:41 Stephen Rothwell
2022-09-26 23:12 broonie
2022-09-27 12:47 ` Miguel Ojeda
2022-09-27 18:16 broonie
2022-09-28 17:16 ` Miguel Ojeda
2022-10-04 22:23 ` Stephen Rothwell
2024-05-06 5:33 Stephen Rothwell
2024-05-06 10:19 ` Miguel Ojeda
2024-05-14 0:20 ` Stephen Rothwell
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=CANiq72k1uL3MdebRtck-EODx2YnucOAb-7hb1zzWy-L7UAwxcQ@mail.gmail.com \
--to=miguel.ojeda.sandonis@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=ark.email@gmail.com \
--cc=geofft@ldpreload.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=me@kloenk.de \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=ojeda@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wedsonaf@google.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 read-only IMAP folder(s) and NNTP newsgroup(s).