From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <ojeda@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Wedson Almeida Filho <walmeida@microsoft.com>
Subject: linux-next: manual merge of the rust tree with the kbuild tree
Date: Mon, 6 May 2024 15:33:33 +1000 [thread overview]
Message-ID: <20240506153333.7b36a0e6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/Makefile
between commit:
7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for source directory")
from the kbuild tree and commit:
11795ae4cc43 ("kbuild: use the upstream `alloc` crate")
from the rust tree.
I fixed it up (the latter commit removed a line updated by the former,
so I did that) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-06 5:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 5:33 Stephen Rothwell [this message]
2024-05-06 10:19 ` linux-next: manual merge of the rust tree with the kbuild tree Miguel Ojeda
2024-05-14 0:20 ` Stephen Rothwell
-- 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-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=20240506153333.7b36a0e6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-next@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=walmeida@microsoft.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).