From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michael Turquette <mturquette@baylibre.com>,
James Liao <jamesjj.liao@mediatek.com>,
Stephen Boyd <sboyd@codeaurora.org>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the omap tree
Date: Thu, 3 Mar 2016 08:32:13 -0800 [thread overview]
Message-ID: <20160303163213.GG4469@atomide.com> (raw)
In-Reply-To: <20160303091631.1ef24e87@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [160302 14:16]:
> Hi Krzysztof,
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> drivers/clk/Kconfig
>
> between commit:
>
> 21330497f303 ("clk: ti: Add support for dm814x ADPLL")
>
> from the omap tree and commit:
>
> b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks yes that's correct thanks!
Regards,
Tony
prev parent reply other threads:[~2016-03-03 16:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 22:16 linux-next: manual merge of the samsung-krzk tree with the omap tree Stephen Rothwell
2016-03-02 23:40 ` Krzysztof Kozlowski
2016-03-03 16:32 ` Tony Lindgren [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=20160303163213.GG4469@atomide.com \
--to=tony@atomide.com \
--cc=jamesjj.liao@mediatek.com \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.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;
as well as URLs for NNTP newsgroup(s).