* linux-next: manual merge of the sound tree with Linus' tree
@ 2011-04-08 4:38 Stephen Rothwell
2011-04-08 6:16 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-04-08 4:38 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Lucas De Marchi, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
WM8958 DSP2 handling into separate file") from the sound tree.
The latter moved the code changed by the former into another file. I did
not bother fixing the spelling errors there.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound tree with Linus' tree
2011-04-08 4:38 linux-next: manual merge of the sound tree with Linus' tree Stephen Rothwell
@ 2011-04-08 6:16 ` Mark Brown
2011-04-10 10:00 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2011-04-08 6:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next, linux-kernel, Lucas De Marchi
On Fri, Apr 08, 2011 at 02:38:25PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
> WM8958 DSP2 handling into separate file") from the sound tree.
> The latter moved the code changed by the former into another file. I did
> not bother fixing the spelling errors there.
I guess I'll fix this by merging up next time there's a -rc. Not sure
why such patches aren't getting done against -next, though.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound tree with Linus' tree
2011-04-08 6:16 ` Mark Brown
@ 2011-04-10 10:00 ` Takashi Iwai
2011-04-10 18:29 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2011-04-10 10:00 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, linux-next, linux-kernel, Lucas De Marchi
At Fri, 8 Apr 2011 07:16:30 +0100,
Mark Brown wrote:
>
> On Fri, Apr 08, 2011 at 02:38:25PM +1000, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
> > misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
> > WM8958 DSP2 handling into separate file") from the sound tree.
>
> > The latter moved the code changed by the former into another file. I did
> > not bother fixing the spelling errors there.
>
> I guess I'll fix this by merging up next time there's a -rc. Not sure
> why such patches aren't getting done against -next, though.
It'd be helpful if you can resolve in your tree.
I've been sick and can't work much since days ago.
thanks,
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound tree with Linus' tree
2011-04-10 10:00 ` Takashi Iwai
@ 2011-04-10 18:29 ` Mark Brown
2011-04-11 9:05 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2011-04-10 18:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Stephen Rothwell, linux-next, linux-kernel, Lucas De Marchi
On Sun, Apr 10, 2011 at 12:00:38PM +0200, Takashi Iwai wrote:
> It'd be helpful if you can resolve in your tree.
I'll do so whenever the next -rc comes out - I know Linus isn't fond of
people pulling random untagged commits.
> I've been sick and can't work much since days ago.
Oh dear, get well soon :(
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound tree with Linus' tree
2011-04-10 18:29 ` Mark Brown
@ 2011-04-11 9:05 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2011-04-11 9:05 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, linux-next, linux-kernel, Lucas De Marchi
At Sun, 10 Apr 2011 11:29:16 -0700,
Mark Brown wrote:
>
> On Sun, Apr 10, 2011 at 12:00:38PM +0200, Takashi Iwai wrote:
>
> > It'd be helpful if you can resolve in your tree.
>
> I'll do so whenever the next -rc comes out - I know Linus isn't fond of
> people pulling random untagged commits.
>
> > I've been sick and can't work much since days ago.
>
> Oh dear, get well soon :(
Thanks!
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the sound tree with Linus' tree
@ 2010-04-07 3:18 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-04-07 3:18 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Tejun Heo, Barry Song
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/codecs/ad1938.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
a1533d94c6b930ef4263941adfd1e1132ca95627 ("ASoC: rename ad1938 to ad193x
and add support for ad1936/7/8/9") from the sound tree.
The latter moved the file that the former modified. I applied the
following merge fixup patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Apr 2010 13:09:13 +1000
Subject: [PATCH] sound: ASoC; merge fixup for slab.h changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
sound/soc/codecs/ad193x.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index 4bfd66b..08c7e10 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -7,6 +7,7 @@
*/
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
--
1.7.0.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-04-11 9:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-08 4:38 linux-next: manual merge of the sound tree with Linus' tree Stephen Rothwell
2011-04-08 6:16 ` Mark Brown
2011-04-10 10:00 ` Takashi Iwai
2011-04-10 18:29 ` Mark Brown
2011-04-11 9:05 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2010-04-07 3:18 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).