From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <krzk@kernel.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
Date: Tue, 25 Jun 2019 09:59:06 +1000 [thread overview]
Message-ID: <20190625095906.06c97e0c@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 767 bytes --]
Hi all,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/configs/s3c6400_defconfig
between commit:
6c48edcc955a ("ARM: configs: Remove useless UEVENT_HELPER_PATH")
from the arm-soc tree and commit:
5a96019ce5cd ("ARM: defconfig: samsung: Cleanup with savedefconfig")
from the samsung-krzk tree.
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-06-24 23:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 23:59 Stephen Rothwell [this message]
2019-06-24 23:59 ` linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-01-31 22:53 Stephen Rothwell
2019-06-25 0:03 Stephen Rothwell
2016-09-05 1:19 Stephen Rothwell
[not found] ` <CGME20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb@eucas1p2.samsung.com>
2016-09-16 8:50 ` Krzysztof Kozlowski
2016-06-06 0:06 Stephen Rothwell
2016-03-01 22:14 Stephen Rothwell
2016-03-01 23:20 ` Krzysztof Kozlowski
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=20190625095906.06c97e0c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/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).