All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@wwwdotorg.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Markus Mayer <markus.mayer@linaro.org>,
	Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 3 Mar 2014 12:02:41 +1100	[thread overview]
Message-ID: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> (raw)

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

Hi Stephen,

Today's linux-next merge of the bcm2835 tree got a conflict in
arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM:
centralize common multi-platform kconfig options") and 0676b21fffd1
("ARM: bcm2835: enable V6K instead of plain V6") from the arm-soc tree
and commit d30fe6272183 ("ARM: bcm2835: Move to mach-bcm directory") from
the bcm2835 tree.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Mar 2014 12:00:40 +1100
Subject: [PATCH] ARM: bcm2835: merge fix for movement to mach-bcm directory

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-bcm/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 396d05c8b570..7de3282a8613 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -33,10 +33,6 @@ config ARCH_BCM2835
 	select ARM_AMBA
 	select ARM_ERRATA_411920
 	select ARM_TIMER_SP804
-	select CLKDEV_LOOKUP
-	select CLKSRC_OF
-	select CPU_V6
-	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select PINCTRL_BCM2835
 	help
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@wwwdotorg.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Markus Mayer <markus.mayer@linaro.org>,
	Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 3 Mar 2014 12:02:41 +1100	[thread overview]
Message-ID: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> (raw)

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

Hi Stephen,

Today's linux-next merge of the bcm2835 tree got a conflict in
arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM:
centralize common multi-platform kconfig options") and 0676b21fffd1
("ARM: bcm2835: enable V6K instead of plain V6") from the arm-soc tree
and commit d30fe6272183 ("ARM: bcm2835: Move to mach-bcm directory") from
the bcm2835 tree.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Mar 2014 12:00:40 +1100
Subject: [PATCH] ARM: bcm2835: merge fix for movement to mach-bcm directory

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-bcm/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 396d05c8b570..7de3282a8613 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -33,10 +33,6 @@ config ARCH_BCM2835
 	select ARM_AMBA
 	select ARM_ERRATA_411920
 	select ARM_TIMER_SP804
-	select CLKDEV_LOOKUP
-	select CLKSRC_OF
-	select CPU_V6
-	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select PINCTRL_BCM2835
 	help
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 3 Mar 2014 12:02:41 +1100	[thread overview]
Message-ID: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> (raw)

Hi Stephen,

Today's linux-next merge of the bcm2835 tree got a conflict in
arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM:
centralize common multi-platform kconfig options") and 0676b21fffd1
("ARM: bcm2835: enable V6K instead of plain V6") from the arm-soc tree
and commit d30fe6272183 ("ARM: bcm2835: Move to mach-bcm directory") from
the bcm2835 tree.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Mar 2014 12:00:40 +1100
Subject: [PATCH] ARM: bcm2835: merge fix for movement to mach-bcm directory

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-bcm/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 396d05c8b570..7de3282a8613 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -33,10 +33,6 @@ config ARCH_BCM2835
 	select ARM_AMBA
 	select ARM_ERRATA_411920
 	select ARM_TIMER_SP804
-	select CLKDEV_LOOKUP
-	select CLKSRC_OF
-	select CPU_V6
-	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select PINCTRL_BCM2835
 	help
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140303/5010523f/attachment.sig>

             reply	other threads:[~2014-03-03  1:02 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-03  1:02 Stephen Rothwell [this message]
2014-03-03  1:02 ` linux-next: manual merge of the bcm2835 tree with the arm-soc tree Stephen Rothwell
2014-03-03  1:02 ` Stephen Rothwell
2014-03-03  5:21 ` Stephen Warren
2014-03-03  5:21   ` Stephen Warren
2014-03-03  5:35   ` Olof Johansson
2014-03-03  5:35     ` Olof Johansson
2014-03-03  5:35     ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2014-12-08  1:06 Stephen Rothwell
2014-12-08  1:06 ` Stephen Rothwell
2014-12-08  1:06 ` Stephen Rothwell
2014-12-08 11:25 ` Arnd Bergmann
2014-12-08 11:25   ` Arnd Bergmann
2014-12-08 13:00   ` Lee Jones
2014-12-08 13:00     ` Lee Jones
2014-12-08 13:28     ` Arnd Bergmann
2014-12-08 13:28       ` Arnd Bergmann
2014-12-08 13:49       ` Lee Jones
2014-12-08 13:49         ` Lee Jones
2014-12-08 15:08         ` Arnd Bergmann
2014-12-08 15:08           ` Arnd Bergmann
2014-12-08 16:08         ` Stephen Warren
2014-12-08 16:08           ` Stephen Warren
2014-12-08 16:51           ` Lee Jones
2014-12-08 16:51             ` Lee Jones
2014-12-08 17:37             ` Stephen Warren
2014-12-08 17:37               ` Stephen Warren
2014-12-09  8:21               ` Lee Jones
2014-12-09  8:21                 ` Lee Jones
2014-03-09 12:14 Mark Brown
2013-03-18  4:06 Stephen Rothwell
2013-03-18  4:06 ` Stephen Rothwell
2013-03-18  4:06 ` Stephen Rothwell
2013-03-18  4:04 Stephen Rothwell
2013-03-18  4:04 ` Stephen Rothwell
2013-03-18  4:04 ` Stephen Rothwell
2013-03-18 15:19 ` Stephen Warren
2013-03-18 15:19   ` Stephen Warren

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=20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=markus.mayer@linaro.org \
    --cc=olof@lixom.net \
    --cc=robh@kernel.org \
    --cc=swarren@wwwdotorg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.