* linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 2:37 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2014-02-24 2:37 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Jason Cooper, andrew, gregory.clement,
linux-arm-kernel
Cc: linux-next, linux-kernel, Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
building of Kirkwood drivers for mach-mvebu") from the tree and commit
9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
platforms") from the sound-asoc tree.
I fixed it up (Probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/kirkwood/Kconfig
index 106e2e22fed2,2dc3ecf34801..000000000000
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
config SND_KIRKWOOD_SOC
tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
help
Say Y or M if you want to add support for codecs attached to
the Kirkwood I2S interface. You will also need to select the
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 2:37 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2014-02-24 2:37 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Jason Cooper, andrew, gregory.clement,
linux-arm-kernel
Cc: linux-next, linux-kernel, Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
building of Kirkwood drivers for mach-mvebu") from the tree and commit
9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
platforms") from the sound-asoc tree.
I fixed it up (Probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/kirkwood/Kconfig
index 106e2e22fed2,2dc3ecf34801..000000000000
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
config SND_KIRKWOOD_SOC
tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
help
Say Y or M if you want to add support for codecs attached to
the Kirkwood I2S interface. You will also need to select the
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 2:37 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2014-02-24 2:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
building of Kirkwood drivers for mach-mvebu") from the tree and commit
9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
platforms") from the sound-asoc tree.
I fixed it up (Probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc sound/soc/kirkwood/Kconfig
index 106e2e22fed2,2dc3ecf34801..000000000000
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
config SND_KIRKWOOD_SOC
tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
help
Say Y or M if you want to add support for codecs attached to
the Kirkwood I2S interface. You will also need to select the
-------------- 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/20140224/4c56b376/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the mvebu tree
2014-02-24 2:37 ` Stephen Rothwell
(?)
@ 2014-02-24 5:54 ` Mark Brown
-1 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-02-24 5:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, Jason Cooper, andrew, gregory.clement,
linux-arm-kernel, linux-next, linux-kernel, Thomas Petazzoni
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:
> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).
That looks right (or at least like it won't do any harm or cause
bisection problems), thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 5:54 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-02-24 5:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Petazzoni, andrew, Jason Cooper, Liam Girdwood,
linux-kernel, linux-next, gregory.clement, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 275 bytes --]
On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:
> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).
That looks right (or at least like it won't do any harm or cause
bisection problems), thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 5:54 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-02-24 5:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:
> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).
That looks right (or at least like it won't do any harm or cause
bisection problems), thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140224/96551577/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the mvebu tree
2014-02-24 2:37 ` Stephen Rothwell
@ 2014-02-24 15:10 ` Jason Cooper
-1 siblings, 0 replies; 8+ messages in thread
From: Jason Cooper @ 2014-02-24 15:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, andrew, gregory.clement,
linux-arm-kernel, linux-next, linux-kernel, Thomas Petazzoni
Stephen,
On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in
> sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
> building of Kirkwood drivers for mach-mvebu") from the tree and commit
> 9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
> platforms") from the sound-asoc tree.
>
> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).
Yes, sorry this isn't ideal. We're moving all DT support from
mach-kirkwood to mach-mvebu and having to keep legacy support for a
cycle. Hence the confusing config symbols.
This resolution is correct.
thx,
Jason.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc sound/soc/kirkwood/Kconfig
> index 106e2e22fed2,2dc3ecf34801..000000000000
> --- a/sound/soc/kirkwood/Kconfig
> +++ b/sound/soc/kirkwood/Kconfig
> @@@ -1,6 -1,6 +1,6 @@@
> config SND_KIRKWOOD_SOC
> tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
> - depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
> - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
> ++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
> help
> Say Y or M if you want to add support for codecs attached to
> the Kirkwood I2S interface. You will also need to select the
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the mvebu tree
@ 2014-02-24 15:10 ` Jason Cooper
0 siblings, 0 replies; 8+ messages in thread
From: Jason Cooper @ 2014-02-24 15:10 UTC (permalink / raw)
To: linux-arm-kernel
Stephen,
On Mon, Feb 24, 2014 at 01:37:52PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in
> sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
> building of Kirkwood drivers for mach-mvebu") from the tree and commit
> 9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
> platforms") from the sound-asoc tree.
>
> I fixed it up (Probably incorrectly - see below) and can carry the fix as
> necessary (no action is required).
Yes, sorry this isn't ideal. We're moving all DT support from
mach-kirkwood to mach-mvebu and having to keep legacy support for a
cycle. Hence the confusing config symbols.
This resolution is correct.
thx,
Jason.
>
> --
> Cheers,
> Stephen Rothwell sfr at canb.auug.org.au
>
> diff --cc sound/soc/kirkwood/Kconfig
> index 106e2e22fed2,2dc3ecf34801..000000000000
> --- a/sound/soc/kirkwood/Kconfig
> +++ b/sound/soc/kirkwood/Kconfig
> @@@ -1,6 -1,6 +1,6 @@@
> config SND_KIRKWOOD_SOC
> tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
> - depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
> - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
> ++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
> help
> Say Y or M if you want to add support for codecs attached to
> the Kirkwood I2S interface. You will also need to select the
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-02-24 15:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-24 2:37 linux-next: manual merge of the sound-asoc tree with the mvebu tree Stephen Rothwell
2014-02-24 2:37 ` Stephen Rothwell
2014-02-24 2:37 ` Stephen Rothwell
2014-02-24 5:54 ` Mark Brown
2014-02-24 5:54 ` Mark Brown
2014-02-24 5:54 ` Mark Brown
2014-02-24 15:10 ` Jason Cooper
2014-02-24 15:10 ` Jason Cooper
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.