archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Olof Johansson <>, Arnd Bergmann <>,
	Linus Walleij <>
Subject: linux-next: manual merge of the arm-soc tree with the  tree
Date: Tue, 29 Oct 2013 18:57:14 +1100	[thread overview]
Message-ID: <> (raw)

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 85649711a895 ("ARM: gemini: delete
<mach/gpio.h>") from the gpio tree and commit f3372c01816e ("ARM: gemini:
convert to GENERIC_CLOCKEVENTS") from the arm-soc tree.

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 55be62c92b60,04163fece49f..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -391,8 -385,10 +390,9 @@@ config ARCH_CLPS711
  config ARCH_GEMINI
  	bool "Cortina Systems Gemini"
+ 	select CLKSRC_MMIO
  	select CPU_FA526
 -	select NEED_MACH_GPIO_H
  	  Support for the Cortina Systems Gemini family SoCs

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

             reply	other threads:[~2013-10-29  7:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-29  7:57 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-05-27  0:45 linux-next: manual merge of the arm-soc tree with the tree Stephen Rothwell
2014-05-27 17:49 ` Tony Lindgren
2014-04-07  0:21 Stephen Rothwell
2013-06-21  6:45 Stephen Rothwell
2012-11-27  4:48 Stephen Rothwell
2012-09-25  6:37 Stephen Rothwell
2012-09-25  7:14 ` Tony Prisk
2012-09-17  8:02 Stephen Rothwell
2012-03-08  6:03 Stephen Rothwell
2012-03-08  6:17 ` 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).