From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Barry Song <21cnbao@gmail.com>
Subject: linux-next: manual merge of the sound tree with Linus' tree
Date: Wed, 7 Apr 2010 13:18:54 +1000 [thread overview]
Message-ID: <20100407131854.d58079df.sfr@canb.auug.org.au> (raw)
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/
next reply other threads:[~2010-04-07 3:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-07 3:18 Stephen Rothwell [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100407131854.d58079df.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=21cnbao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).