From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ben Dooks <ben-linux@fluff.org>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the samsung tree
Date: Tue, 17 Aug 2010 10:30:14 +0100 [thread overview]
Message-ID: <20100817093014.GA18622@rakim.wolfsonmicro.main> (raw)
In-Reply-To: <20100817122137.aa6f269e.sfr@canb.auug.org.au>
On Tue, Aug 17, 2010 at 12:21:37PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/mach-s3c64xx/mach-smdk6410.c between commit
> 96e9d908a7b5b5be774ba26aca0d6633e7c97f63 ("ARM: SMDK6410: Register AC97
> controller") from the samsung tree and commit
> f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
> Multi-Component Support") from the sound-asoc tree.
Oh dear, the AC'97 controller addition was supposed to make it into
2.6.36.
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks.
prev parent reply other threads:[~2010-08-17 9:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 2:21 linux-next: manual merge of the sound-asoc tree with the samsung tree Stephen Rothwell
2010-08-17 9:30 ` Mark Brown [this message]
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=20100817093014.GA18622@rakim.wolfsonmicro.main \
--to=broonie@opensource.wolfsonmicro.com \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=sfr@canb.auug.org.au \
/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).