archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Olof Johansson <>, Arnd Bergmann <>,
	Alexander Shiyan <>,
	Linus Walleij <>
Subject: linux-next: manual merge of the arm-soc tree with the gpio-lw tree
Date: Fri, 26 Oct 2012 14:24:34 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 835 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit a3b8d4a51357 ("GPIO: Add support for GPIO
on CLPS711X-target platform") from the gpio-lw tree and commit
4a8355c4c34f ("ARM: clps711x: convert to clockevents") from the arm-soc

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc arch/arm/Kconfig
index a7c541e,d9b7a84..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -366,8 -364,6 +366,7 @@@ config ARCH_CNS3XX
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
  	select COMMON_CLK
  	select CPU_ARM720T

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-10-26  3:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-26  3:24 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-04-09  7:47 linux-next: manual merge of the arm-soc tree with the gpio-lw tree Stephen Rothwell
2013-04-09  9:04 ` Tony Prisk
2012-07-09  6:02 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).