From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alim Akhtar <alim.akhtar@samsung.com>
Subject: Re: linux-next: manual merge of the clockevents tree with the samsung-krzk tree
Date: Mon, 23 Nov 2015 10:45:39 +0900 [thread overview]
Message-ID: <56526FC3.3040009@samsung.com> (raw)
In-Reply-To: <20151123122247.23eb6f3d@canb.auug.org.au>
On 23.11.2015 10:22, Stephen Rothwell wrote:
> Hi Daniel,
>
> Today's linux-next merge of the clockevents tree got a conflict in:
>
> arch/arm/mach-exynos/Kconfig
>
> between commit:
>
> 23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff")
>
> from the samsung-krzk tree and commit:
>
> b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option")
>
> from the clockevents tree.
>
> OK, so these entries were sorted at one point for a reason :-(
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks, merge fix looks good. Indeed we should have put them in
alphabetical order.
Best regards,
Krzysztof
prev parent reply other threads:[~2015-11-23 1:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 1:22 linux-next: manual merge of the clockevents tree with the samsung-krzk tree Stephen Rothwell
2015-11-23 1:45 ` Krzysztof Kozlowski [this message]
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=56526FC3.3040009@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=alim.akhtar@samsung.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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