From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>, Shawn Guo <shawn.guo@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Burton <paul.burton@imgtec•com>
Subject: linux-next: manual merge of the mips tree with the imx-mxs tree
Date: Mon, 1 Jun 2015 11:41:34 +1000 [thread overview]
Message-ID: <20150601114134.34e60286@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
drivers into drivers/clk") from the imx-mxs tree and commit
66ab9263a018 ("clk: ingenic: add driver for Ingenic SoC CGU clocks")
from the mips 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/Makefile
index 96e9778ac9bd,cc773271b919..000000000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_ARCH_BERLIN) += berlin
obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/
obj-$(CONFIG_ARCH_HIP04) += hisilicon/
obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/
+obj-$(CONFIG_ARCH_MXC) += imx/
+ obj-$(CONFIG_MACH_INGENIC) += ingenic/
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
ifeq ($(CONFIG_COMMON_CLK), y)
obj-$(CONFIG_ARCH_MMP) += mmp/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-01 1:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 1:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-26 1:52 linux-next: manual merge of the mips tree with the imx-mxs tree Stephen Rothwell
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=20150601114134.34e60286@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.burton@imgtec$(echo .)com \
--cc=ralf@linux-mips$(echo .)org \
--cc=shawn.guo@linaro$(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