From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Emil Medve <Emilian.Medve@Freescale•com>,
Michael Ellerman <mpe@ellerman•id.au>
Subject: linux-next: manual merge of the clk tree with Linus' tree
Date: Fri, 20 Feb 2015 11:17:50 +1100 [thread overview]
Message-ID: <20150220111750.1aca940b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/powerpc/configs/corenet32_smp_defconfig between commit
a85cade6762b ("powerpc: Update all configs using savedefconfig") from
the tree and commit 8f0ab1e14139 ("powerpc/corenet: Enable CLK_QORIQ")
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 arch/powerpc/configs/corenet32_smp_defconfig
index 51866f170684,cce62e934e0c..000000000000
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@@ -138,10 -143,11 +138,11 @@@ CONFIG_RTC_DRV_DS1307=
CONFIG_RTC_DRV_DS1374=y
CONFIG_RTC_DRV_DS3232=y
CONFIG_UIO=y
-CONFIG_STAGING=y
-CONFIG_MEMORY=y
CONFIG_VIRT_DRIVERS=y
CONFIG_FSL_HV_MANAGER=y
+CONFIG_STAGING=y
+CONFIG_FSL_CORENET_CF=y
+ CONFIG_CLK_QORIQ=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-20 0:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-20 0:17 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-29 22:07 linux-next: manual merge of the clk tree with Linus' tree Stephen Rothwell
2019-06-06 23:13 Stephen Rothwell
2017-07-24 0:37 Stephen Rothwell
2014-01-29 3:25 Stephen Rothwell
2014-01-29 8:53 ` Nicolas Ferre
2013-08-27 9:03 Stephen Rothwell
2013-08-27 10:09 ` James Hogan
2013-08-27 15:44 ` Sören Brinkmann
2013-08-27 16:53 ` Mike Turquette
2013-08-28 0:04 ` Stephen Rothwell
2013-08-28 7:22 ` Stephen Rothwell
2013-08-28 8:05 ` James Hogan
2013-08-28 15:48 ` Sören Brinkmann
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=20150220111750.1aca940b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Emilian.Medve@Freescale$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=mturquette@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