linux-kernel - linux-next: manual merge of the sound tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20100407131854.d58079df.sfr@canb.auug.org.au>
Date:	Wed, 7 Apr 2010 13:18:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Takashi Iwai <tiwai@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>, Barry Song <21cnbao@...il.com>
Subject: linux-next: manual merge of the sound tree with Linus' tree

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@...b.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@...b.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/