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,
Jassi Brar <jassi.brar@samsung•com>,
Kukjin Kim <kgene.kim@samsung•com>
Subject: linux-next: manual merge of the sound tree with the s5p tree
Date: Thu, 23 Dec 2010 11:53:39 +1100 [thread overview]
Message-ID: <20101223115339.1ce18216.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/samsung/smdk_wm8580.c sound/soc/samsung/smdk_wm9713.c between
commit 7ca825bed699c77b218ead402202df384556950b ("ASoC: Samsung: Rename
DMA device") from the s5p tree and various commits from the sound tree.
I used the versions from the sound tree that seemed to be supersets of the
ones from the s5p tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-12-23 0:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-23 0:53 Stephen Rothwell [this message]
2010-12-23 10:31 ` linux-next: manual merge of the sound tree with the s5p tree Kukjin Kim
2010-12-23 11:03 ` Takashi Iwai
2010-12-23 11:11 ` Kukjin Kim
2010-12-23 11:17 ` Takashi Iwai
2010-12-23 11:28 ` Kukjin Kim
2010-12-23 14:30 ` Takashi Iwai
2010-12-24 1:32 ` Kukjin Kim
2010-12-24 8:27 ` Russell King
2010-12-28 2:24 ` Kukjin Kim
2010-12-28 15:39 ` Mark Brown
2010-12-28 16:23 ` Russell King
2010-12-28 16:40 ` Mark Brown
2010-12-30 0:54 ` Kukjin Kim
2010-12-23 11:50 ` Mark Brown
2010-12-23 11:54 ` Piotr Hosowicz
2010-12-23 11:56 ` Mark Brown
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=20101223115339.1ce18216.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jassi.brar@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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