From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jarkko Nikula <jhnikula@gmail.com>,
linux-omap@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound-asoc tree with the omap tree
Date: Tue, 17 Aug 2010 09:15:59 +0300 [thread overview]
Message-ID: <20100817061558.GD12184@atomide.com> (raw)
In-Reply-To: <20100817122145.f399e543.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [100817 05:14]:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/mach-omap2/board-n8x0.c between commits
> 1c37553eb1778802f0e7b6730df36542752e801e ("omap: n8x0: Cleanup i2c1 and
> menelaus registration") and 69be0f6f4b8e3be992ab6a333a3a82e043784c52
> ("omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810")
> from the omap tree and commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0
> ("ASoC: multi-component - ASoC Multi-Component Support") from the
> sound-asoc tree.
>
> I couldn't figure this out, so I effectively reverted the part of the
> latter commit affecting that file. Is there no way that the latter
> commit can be broken up into smaller self contained pieces?
Let's let Jarkko and Liam to queue these along with the other
ASoC patches, I'll drop them from omap for-next.
Jarkko, can you please rebase them?
Regards,
Tony
next prev parent reply other threads:[~2010-08-17 6:16 UTC|newest]
Thread overview: 6+ 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 omap tree Stephen Rothwell
2010-08-17 6:15 ` Tony Lindgren [this message]
2010-08-17 6:34 ` Jarkko Nikula
2010-08-17 6:58 ` [PATCH] ASoC: multi-component - Drop board-n8x0.c changes Jarkko Nikula
2010-08-17 10:12 ` Mark Brown
2010-08-17 7:53 ` linux-next: manual merge of the sound-asoc tree with the omap tree Tony Lindgren
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=20100817061558.GD12184@atomide.com \
--to=tony@atomide.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jhnikula@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@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).