* linux-next: manual merge of the mvebu tree with Linus' tree
@ 2014-07-17 1:44 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-07-17 1:44 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4
("cpuidle: mvebu: Fix the name of the states") from Linus' tree and
commit 742450174037 ("cpuidle: mvebu: rename the driver from
armada-370-xp to mvebu-v7") from the mvebu tree.
The former patch appears to have been applied to the
renamed file, so there was nothing to do (except remove the git created
version of the old file).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the mvebu tree with Linus' tree
@ 2014-07-14 1:06 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-07-14 1:06 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Stephen Boyd, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/Kconfig between commit 19682f72f5db ("ARM: Remove
ARCH_HAS_CPUFREQ config option") from Linus' tree and commit
ba364fc752da ("ARM: Kirkwood: Remove mach-kirkwood") from the mvebu
tree.
I fixed it up (The latter just removed the whole ARCH_KIRKWOOD entry,
so I did that) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the mvebu tree with Linus' tree
2014-06-23 0:57 Stephen Rothwell
@ 2014-06-23 12:21 ` Jason Cooper
0 siblings, 0 replies; 5+ messages in thread
From: Jason Cooper @ 2014-06-23 12:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: andrew, gregory.clement, linux-arm-kernel, linux-next,
linux-kernel, Rob Herring, Arnd Bergmann
On Mon, Jun 23, 2014 at 10:57:41AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use
> menuconfig for sub-arch menus") from Linus' tree and commit
> 55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from
> the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good. Thanks Stephen.
thx,
Jason.
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the mvebu tree with Linus' tree
@ 2014-06-23 0:57 Stephen Rothwell
2014-06-23 12:21 ` Jason Cooper
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-06-23 0:57 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Rob Herring, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use
menuconfig for sub-arch menus") from Linus' tree and commit
55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from
the mvebu 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/arm/mach-mvebu/Kconfig
index 4a7c250c9a30,8e3b5f12cd7c..000000000000
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -94,4 -99,13 +96,11 @@@ config MACH_KIRKWOO
Say 'Y' here if you want your kernel to support boards based
on the Marvell Kirkwood device tree.
+ config MACH_NETXBIG
+ bool "LaCie 2Big and 5Big Network v2"
+ depends on MACH_KIRKWOOD
+ help
+ Say 'Y' here if you want your kernel to support the
+ LaCie 2Big and 5Big Network v2
+
-endmenu
-
endif
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the mvebu tree with Linus' tree
@ 2014-02-24 0:48 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-02-24 0:48 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Kumar Gala, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
d5f93b8ad01e ("of: Update qcom vendor prefix description") from Linus'
tree and commit f7f2ea9f49b0 ("DT: Vendor prefixes: Add ricoh, qnap, sii
and synology") from the mvebu 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 Documentation/devicetree/bindings/vendor-prefixes.txt
index e9d19e2b359b,c73b435f58f5..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -69,7 -64,8 +69,8 @@@ phytec PHYTEC Messtechnik Gmb
picochip Picochip Ltd
powervr PowerVR (deprecated, use img)
qca Qualcomm Atheros, Inc.
-qcom Qualcomm, Inc.
+qcom Qualcomm Technologies, Inc
+ qnap QNAP Systems, Inc.
ralink Mediatek/Ralink Technology Corp.
ramtron Ramtron International
realtek Realtek Semiconductor Corp.
@@@ -81,9 -78,9 +83,10 @@@ schindler Schindle
sil Silicon Image
silabs Silicon Laboratories
simtek
+ sii Seiko Instruments, Inc.
sirf SiRF Technology, Inc.
snps Synopsys, Inc.
+spansion Spansion Inc.
st STMicroelectronics
ste ST-Ericsson
stericsson ST-Ericsson
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-17 1:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-17 1:44 linux-next: manual merge of the mvebu tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-07-14 1:06 Stephen Rothwell
2014-06-23 0:57 Stephen Rothwell
2014-06-23 12:21 ` Jason Cooper
2014-02-24 0:48 Stephen Rothwell
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).