From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752950AbbJFOct (ORCPT ); Tue, 6 Oct 2015 10:32:49 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:47111 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264AbbJFOcs (ORCPT ); Tue, 6 Oct 2015 10:32:48 -0400 Date: Tue, 6 Oct 2015 15:31:47 +0100 From: Mark Brown To: David Miller Cc: jonringle@gmail.com, jon@ringle.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, jringle@gridpoint.com Message-ID: <20151006143147.GR12635@sirena.org.uk> References: <20151005.232956.105884641412802470.davem@davemloft.net> <20151006101305.GG12635@sirena.org.uk> <20151006.062508.168154086334967576.davem@davemloft.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rPdL5sOQ4GFWV+a5" Content-Disposition: inline In-Reply-To: <20151006.062508.168154086334967576.davem@davemloft.net> X-Cookie: Walk softly and carry a megawatt laser. User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 89.101.192.72 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: [PATCH 1/2] regmap: only call custom reg_update_bits() if reg is marked volatile 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 --rPdL5sOQ4GFWV+a5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Oct 06, 2015 at 06:25:08AM -0700, David Miller wrote: > > 4) David should then merge the regmap for-next branch into net-next > Nope, this doesn't work at all. > It is my tree which people depend upon, not the other way around. Yes, it does work - this is the way we normally handle cross tree issues. There is nothing about pulling code from other trees into your tree which will stop other people depending on your tree, obviously anything you merge in needs to stay fast forward only and ideally not make any resulting pull requests look terrible but that's really the only restriction. --rPdL5sOQ4GFWV+a5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWE9tOAAoJECTWi3JdVIfQJBEH/0RyOjl+Qf34USN0sIR4SAZh zMqUpOk+DYaj2BQy/SXHYqQ0qAy7zFN8JJgkTtaV9HQhUlPiHSffvoI5QTa79QvR JOamwsEvRxPogQocvDfqYyEq3PMIPnBXgSHusXkGEil2Ahpxkr6rwEqd+4WHS2p4 YRdhwTspBsUlEzk8rdFX/ilKI96igeEuUCyG9GukblTVElmKuOWsWWCzRkQKiDYL VR1afcS8uW1JgpGl+DbpMeAla/27U4O8fSNMNz8fCGmSNIVanFaBFbqObLKtr1QL 7KAfoL1uLDJzU7hWKgdLFOtKhR+KiPJfGm+giTv7JSRdLQpbd7gytztccLxp4Ww= =1pEH -----END PGP SIGNATURE----- --rPdL5sOQ4GFWV+a5--