From: Mark Brown <broonie@kernel.org>
To: David Miller <davem@davemloft.net>
Cc: jonringle@gmail.com, jon@ringle.org, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
jringle@gridpoint.com
Subject: Re: [PATCH 1/2] regmap: only call custom reg_update_bits() if reg is marked volatile
Date: Tue, 6 Oct 2015 15:31:47 +0100 [thread overview]
Message-ID: <20151006143147.GR12635@sirena.org.uk> (raw)
In-Reply-To: <20151006.062508.168154086334967576.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
next prev parent reply other threads:[~2015-10-06 14:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 13:29 [PATCH 1/2] regmap: only call custom reg_update_bits() if reg is marked volatile jon
2015-10-05 13:29 ` [PATCH 2/2] net: encx24j600: Simplified regmap_encx24j600_reg_update_bits() jon
2015-10-05 14:57 ` [PATCH 1/2] regmap: only call custom reg_update_bits() if reg is marked volatile Mark Brown
2015-10-06 6:29 ` David Miller
2015-10-06 10:13 ` Mark Brown
2015-10-06 12:50 ` Jon Ringle
2015-10-06 13:25 ` David Miller
2015-10-06 14:31 ` Mark Brown [this message]
2015-10-06 13:26 ` David Miller
2015-10-06 13:37 ` Mark Brown
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=20151006143147.GR12635@sirena.org.uk \
--to=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=jon@ringle.org \
--cc=jonringle@gmail.com \
--cc=jringle@gridpoint.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).