From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@codeaurora•org>,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
James Liao <jamesjj.liao@mediatek•com>
Subject: linux-next: manual merge of the clk tree with the samsung-krzk tree
Date: Tue, 16 Feb 2016 15:11:31 +1100 [thread overview]
Message-ID: <20160216151131.3e1d4cb5@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
drivers/clk/samsung/Kconfig
between commit:
fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")
from the samsung-krzk tree and commit:
b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
from the clk tree.
I fixed it up (they both had similar effects) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-16 4:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 4:11 Stephen Rothwell [this message]
2016-02-16 4:30 ` linux-next: manual merge of the clk tree with the samsung-krzk tree 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=20160216151131.3e1d4cb5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jamesjj.liao@mediatek$(echo .)com \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=sboyd@codeaurora$(echo .)org \
/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