From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@codeaurora•org>,
Scott Wood <scottwood@freescale•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Javier Martinez Canillas <javier@osg•samsung.com>
Subject: linux-next: manual merge of the clk tree with the fsl tree
Date: Mon, 2 Nov 2015 01:35:22 +1100 [thread overview]
Message-ID: <20151102013522.6ee46cd4@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/Kconfig
between commit:
9e19ca2f627e ("clk: qoriq: Add ls2080a support.")
from the fsl tree and commit:
4a7748c3d641 ("clk: Allow drivers to build if COMPILE_TEST is enabled")
from the clk tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/clk/Kconfig
index 67826167a0e0,57316528e924..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -131,7 -132,7 +142,7 @@@ config COMMON_CLK_AXI_CLKGE
config CLK_QORIQ
bool "Clock driver for Freescale QorIQ platforms"
- depends on (PPC_E500MC || ARM || ARM64) && OF
- depends on (PPC_E500MC || ARM || COMPILE_TEST) && OF
++ depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF
---help---
This adds the clock driver support for Freescale QorIQ platforms
using common clock framework.
reply other threads:[~2015-11-01 14:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20151102013522.6ee46cd4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=javier@osg$(echo .)samsung.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=scottwood@freescale$(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