From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbcCBDHW (ORCPT ); Tue, 1 Mar 2016 22:07:22 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:51062 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751236AbcCBDHV (ORCPT ); Tue, 1 Mar 2016 22:07:21 -0500 Date: Wed, 2 Mar 2016 12:07:17 +0900 From: Mark Brown To: Stephen Rothwell Cc: linux-kernel@vger.kernel.org Message-ID: <20160302030717.GT18327@sirena.org.uk> References: <20160301090019.67b2de58@canb.auug.org.au> <20160301022544.GE18327@sirena.org.uk> <20160301181146.48689326@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LD01is6UWFPt+rX5" Content-Disposition: inline In-Reply-To: <20160301181146.48689326@canb.auug.org.au> X-Cookie: Adapt. Enjoy. Survive. User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: 122.212.32.58 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: Applied "regmap: Keep regmap_write_bits()" to the regmap tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --LD01is6UWFPt+rX5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Mar 01, 2016 at 06:11:46PM +1100, Stephen Rothwell wrote: > On Tue, 1 Mar 2016 11:25:44 +0900 Mark Brown wrote: > > It'll sort itself out by the time things get merged down into Linus' > > tree, that's why I did it as a revert rather than just dropping the > > patch. Linus generally takes regmap before ALSA. > Well, I have the sound trees before the regmap tree. I also dislike Oh, that's a bit surprising. > having these sort of dependencies between trees. What happens if Linus > does merge the sound tree first? > You already merged part of the regmap tree into the sound-asoc tree, > why not do that again with the fix? I tend to treat things that are real fixes as opposed to things that are test only fixes a bit differently to each other - lots of cross merges get messy, if it's not going to hit someone doing something in a real system I tend to not worry about it too much. --LD01is6UWFPt+rX5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJW1ljkAAoJECTWi3JdVIfQA18H/0msuTz942h6qv/L9RCv8Hmz aM8QeXeseJw72Eje3CsPpB7JCwX+K9I8QrAgEBwpv6A2GG66OGgURIG0xDAsYozV yavsemPFGlbHn6/WNGCVG/2/0QVGMQtiWhGnz+bUTq9gOwHdXNK5dnwMmRHx01Sk oIZi7gVp3IhsbqZeJrf5/D7crlmvhFKUMFODV6C6r6gcgUfCM++q38Hbg/93u7GD zdBv2tU9SrGG+gPFVgJpHIqAzGL0qtvfG27Pb9YVU8kj43z8XTphwjsMYtwom2VM BYXVbc8HnBDHLbyp4KY6IU4U7lk4/CR3tal9sHWvm390KFcA8SslmkAMdxFiSk4= =/cdr -----END PGP SIGNATURE----- --LD01is6UWFPt+rX5--