From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Denis Efremov <efremov@linux.com>
Subject: linux-next: manual merge of the kbuild tree with Linus' tree
Date: Fri, 5 Jun 2020 08:59:37 +1000 [thread overview]
Message-ID: <20200605085937.4b3f1d96@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
Hi all,
Today's linux-next merge of the kbuild tree got a conflict in:
arch/mips/lasat/image/Makefile
between commit:
10760dde9be3 ("MIPS: Remove support for LASAT")
from Linus' tree and commit:
1312a1e434c1 ("kbuild: add variables for compression tools")
from the kbuild 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:[~2020-06-04 22:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-04 22:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-06 18:16 linux-next: manual merge of the kbuild tree with Linus' tree Stephen Rothwell
2022-05-27 0:08 Stephen Rothwell
2022-04-03 22:09 Stephen Rothwell
2021-04-26 23:02 Stephen Rothwell
2021-02-22 22:24 Stephen Rothwell
2019-05-01 22:46 Stephen Rothwell
2017-05-02 22:14 Stephen Rothwell
2016-09-12 1:32 Stephen Rothwell
2016-09-12 2:53 ` Nicholas Piggin
2016-09-12 9:03 ` Michal Marek
2016-09-12 23:39 ` Stephen Rothwell
2016-09-13 4:02 ` Stephen Rothwell
2016-09-13 4:09 ` Nicholas Piggin
2016-09-13 7:48 ` Arnd Bergmann
2016-09-13 9:12 ` Nicholas Piggin
2016-07-28 1:50 Stephen Rothwell
2015-07-02 0:30 Stephen Rothwell
2015-07-02 6:47 ` Geert Uytterhoeven
2015-07-02 7:17 ` Michal Marek
2015-07-02 9:18 ` Geert Uytterhoeven
2015-07-02 19:53 ` Michal Marek
2015-07-03 11:56 ` Geert Uytterhoeven
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=20200605085937.4b3f1d96@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=efremov@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=tsbogend@alpha.franken.de \
/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).