From: Krzysztof Kozlowski <krzk@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Marc Zyngier <marc.zyngier@arm•com>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
Date: Fri, 16 Sep 2016 10:50:52 +0200 [thread overview]
Message-ID: <531f80d6-4cf6-ae83-7cb6-e002a6e8f63f@kernel.org> (raw)
In-Reply-To: <20160905111948.553487be@canb.auug.org.au>
On 09/05/2016 03:19 AM, Stephen Rothwell wrote:
> Hi Krzysztof,
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm64/boot/dts/exynos/exynos7.dtsi
>
> between commit:
>
> 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger")
>
> from the arm-soc tree and commit:
>
> 36d1c9cd07cd ("arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags")
>
> from the samsung-krzk tree.
>
> I fixed it up (I *think* - 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.
The fix is correct, for the record:
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung•com>
Merge conflict was (unfortunately) expected. In general, the
multiple-platform-at-once patches are conflict prone. Especially in this
case, Marc's patch ("arm64: dts: Fix broken architected...") could be
split per architecture.
Best regards,
Krzysztof
next prev parent reply other threads:[~2016-09-16 8:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb@eucas1p2.samsung.com>
2016-09-05 1:19 ` linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Stephen Rothwell
2016-09-16 8:50 ` Krzysztof Kozlowski [this message]
2022-01-31 22:53 Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-25 0:03 Stephen Rothwell
2019-06-24 23:59 Stephen Rothwell
2019-06-24 23:59 ` Stephen Rothwell
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=531f80d6-4cf6-ae83-7cb6-e002a6e8f63f@kernel.org \
--to=krzk@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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