From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: Daniel Lezcano <daniel.lezcano@linaro•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexander Shiyan <shc_work@mail•ru>,
Linus <torvalds@linux-foundation•org>
Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
Date: Wed, 27 Jul 2016 08:08:45 +1000 [thread overview]
Message-ID: <20160727080845.12b58ebe@canb.auug.org.au> (raw)
In-Reply-To: <20160707141226.2b9c1e15@canb.auug.org.au>
Hi All,
On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi Daniel,
>
> Today's linux-next merge of the clockevents tree got a conflict in:
>
> arch/arm/Kconfig
>
> between commit:
>
> c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM")
>
> from the arm-soc tree and commit:
>
> 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option")
>
> from the clockevents tree.
>
> I fixed it up (I used the arm-soc version of this file and then added
> the following merge fix patch) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Thu, 7 Jul 2016 13:59:06 +1000
> Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> arch/arm/mach-clps711x/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
> index 3b56197ccfd0..dc7c6edeab39 100644
> --- a/arch/arm/mach-clps711x/Kconfig
> +++ b/arch/arm/mach-clps711x/Kconfig
> @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X
> depends on ARCH_MULTI_V4T
> select ARCH_REQUIRE_GPIOLIB
> select AUTO_ZRELADDR
> - select CLKSRC_MMIO
> select CLKSRC_OF
> + select CLPS711X_TIMER
> select COMMON_CLK
> select CPU_ARM720T
> select GENERIC_CLOCKEVENTS
> --
> 2.8.1
Since Linus has merged most of the tip tree now, this merge fixup is
required when (part of) the arm-soc tree is moerged with Linus' tree.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-07-26 22:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 4:12 linux-next: manual merge of the clockevents tree with the arm-soc tree Stephen Rothwell
2016-07-11 5:28 ` Stephen Rothwell
2016-07-15 17:06 ` Daniel Lezcano
2016-07-26 22:08 ` Stephen Rothwell [this message]
2016-08-01 23:24 ` Stephen Rothwell
2016-08-02 1:26 ` Linus Torvalds
2016-08-02 1:28 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2017-04-10 3:18 Stephen Rothwell
2016-06-07 2:56 Stephen Rothwell
2014-05-26 5:43 Stephen Rothwell
2014-05-26 6:03 ` Li.Xiubo
2014-05-26 7:49 ` Shawn Guo
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=20160727080845.12b58ebe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=shc_work@mail$(echo .)ru \
--cc=torvalds@linux-foundation$(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