From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
James Hogan <jhogan@kernel.org>
Subject: linux-next: manual merge of the asm-generic tree with the kbuild tree
Date: Wed, 28 Mar 2018 09:02:22 +1100 [thread overview]
Message-ID: <20180328090222.0f3c34da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi all,
Today's linux-next merge of the asm-generic tree got a conflict in:
arch/metag/boot/dts/Makefile
between commit:
b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers")
from the kbuild tree and commit:
bb6fb6dfcc17 ("metag: Remove arch/metag/")
from the asm-generic tree.
I fixed it up (I just removed the file) 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:[~2018-03-27 22:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 22:02 Stephen Rothwell [this message]
2018-04-03 23:10 ` linux-next: manual merge of the asm-generic tree with the kbuild tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-03-06 22:38 Stephen Rothwell
2024-03-12 23:10 ` Stephen Rothwell
2018-03-14 22:42 Stephen Rothwell
2018-04-03 23:07 ` 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=20180328090222.0f3c34da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yamada.masahiro@socionext.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 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.