From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <krzk@kernel.org>, Christoph Hellwig <hch@lst.de>
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 dma-mapping tree
Date: Thu, 10 May 2018 09:16:34 +1000 [thread overview]
Message-ID: <20180510091634.7fb3aaf2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/mach-exynos/Kconfig
between commit:
4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
from the dma-mapping tree and commit:
c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
from the samsung-krzk tree.
I fixed it up (the latter removed the whole section modified by
the former, so I just removed the section) 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-05-09 23:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 23:16 Stephen Rothwell [this message]
2018-05-14 23:09 ` linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree Stephen Rothwell
2018-05-15 6:10 ` 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=20180510091634.7fb3aaf2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).