linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the i.MX tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100930064533.GJ29811@pengutronix.de>
Date:	Thu, 30 Sep 2010 08:45:33 +0200
From:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Liam Girdwood <lrg@...mlogic.co.uk>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the i.MX
	tree

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/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/