From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Krzysztof Kozlowski <k.kozlowski@samsung•com>,
Tony Lindgren <tony@atomide•com>
Cc: 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: linux-next: manual merge of the samsung-krzk tree with the omap tree
Date: Thu, 3 Mar 2016 09:16:31 +1100 [thread overview]
Message-ID: <20160303091631.1ef24e87@canb.auug.org.au> (raw)
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).
--
Cheers,
Stephen Rothwell
diff --cc drivers/clk/Kconfig
index 5bf16ccc010b,de707b2bfb73..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -202,12 -202,9 +202,10 @@@ config COMMON_CLK_CDCE70
source "drivers/clk/bcm/Kconfig"
source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/mvebu/Kconfig"
source "drivers/clk/qcom/Kconfig"
+ source "drivers/clk/samsung/Kconfig"
+ source "drivers/clk/tegra/Kconfig"
+source "drivers/clk/ti/Kconfig"
endmenu
-
- source "drivers/clk/mvebu/Kconfig"
-
- source "drivers/clk/samsung/Kconfig"
- source "drivers/clk/tegra/Kconfig"
next reply other threads:[~2016-03-02 22:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 22:16 Stephen Rothwell [this message]
2016-03-02 23:40 ` linux-next: manual merge of the samsung-krzk tree with the omap tree Krzysztof Kozlowski
2016-03-03 16:32 ` Tony Lindgren
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=20160303091631.1ef24e87@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 \
--cc=tony@atomide$(echo .)com \
/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