linux-next: manual merge of the slabh tree with the sound tree

linux-next: manual merge of the slabh tree with the sound tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the slabh tree got a conflict in  between
commit a1533d94c6b930ef4263941adfd1e1132ca95627 ("ASoC: rename ad1938 to
ad193x and add support for ad1936/7/8/9") from the sound tree and commit
869d4cce05404996cc7969a9ffd1da27e65e6630 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from the slabh tree.

The former renamed a file modified by the latter.  I applied the
following merge fixup patch.  This patch could, I assume, be applied to
the sound tree now, right Tejun?

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Mar 2010 15:23:06 +1100
Subject: [PATCH] sound: update for removeal of slab.h from percpu.h

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 d034464..e108206 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
-- 
1.7.0.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: manual merge of the slabh tree with the sound tree

[Takashi Iwai]

At Mon, 29 Mar 2010 15:32:18 +1100,
Stephen Rothwell wrote:
> 
> Hi Tejun,
> 
> Today's linux-next merge of the slabh tree got a conflict in  between
> commit a1533d94c6b930ef4263941adfd1e1132ca95627 ("ASoC: rename ad1938 to
> ad193x and add support for ad1936/7/8/9") from the sound tree and commit
> 869d4cce05404996cc7969a9ffd1da27e65e6630 ("include cleanup: Update gfp.h
> and slab.h includes to prepare for breaking implicit slab.h inclusion
> from percpu.h") from the slabh tree.
> 
> The former renamed a file modified by the latter.  I applied the
> following merge fixup patch.  This patch could, I assume, be applied to
> the sound tree now, right Tejun?

I applied Stephen's patch now to topic/asoc branch on sound git tree.
Please let me know if anything else is needed.


thanks,

Takashi

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 29 Mar 2010 15:23:06 +1100
> Subject: [PATCH] sound: update for removeal of slab.h from percpu.h
> 
> 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 d034464..e108206 100644
> --- a/sound/soc/codecs/ad193x.c
> +++ b/sound/soc/codecs/ad193x.c
> @@ -12,6 +12,7 @@
>  #include <linux/device.h>
>  #include <linux/i2c.h>
>  #include <linux/spi/spi.h>
> +#include <linux/slab.h>
>  #include <sound/core.h>
>  #include <sound/pcm.h>
>  #include <sound/pcm_params.h>
> -- 
> 1.7.0.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 

Re: linux-next: manual merge of the slabh tree with the sound tree

[Stephen Rothwell]

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

Hi Takashi,

On Mon, 29 Mar 2010 08:31:23 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> I applied Stephen's patch now to topic/asoc branch on sound git tree.
> Please let me know if anything else is needed.

Thanks for that.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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