From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the i.MX tree
Date: Thu, 30 Sep 2010 08:45:33 +0200 [thread overview]
Message-ID: <20100930064533.GJ29811@pengutronix.de> (raw)
In-Reply-To: <20100930033110.GA5762@opensource.wolfsonmicro.com>
On Wed, Sep 29, 2010 at 08:31:11PM -0700, Mark Brown wrote:
> On Thu, Sep 30, 2010 at 11:23:02AM +1000, Stephen Rothwell wrote:
>
> > The former removed that code that the latter changed. I just used the
> > former.
>
> > The latter was just changing some names, so ti may be able to be
> > integrated into the former.
>
> Though doing that would break bisection. The other option would be to
> revert the bit of the multi-component change that does the rename which
> I think should be safe - Sacha, Liam, does that seem sensible? There is
> the issue with other potential non-audio users of the SSI to be
> considered.
I might be wrong, but I think there are no non-audio users of the ssi
device?
I think the correct fix is to squash the patch I just sent into the
commit merging the two.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2010-09-30 6:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 1:23 linux-next: manual merge of the sound-asoc tree with the i.MX tree Stephen Rothwell
2010-09-30 3:31 ` Mark Brown
2010-09-30 6:45 ` Uwe Kleine-König [this message]
2010-09-30 6:58 ` Mark Brown
2010-09-30 7:44 ` Uwe Kleine-König
2010-09-30 6:41 ` Uwe Kleine-König
2010-09-30 6:52 ` Uwe Kleine-König
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=20100930064533.GJ29811@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=s.hauer@pengutronix.de \
--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).