mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jon Ringle <jonringle@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: David Miller <davem@davemloft.net>,
	"jon@ringle.org" <jon@ringle.org>,
	"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"jringle@gridpoint.com" <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 08:50:43 -0400	[thread overview]
Message-ID: <ABC562FD-5DE5-452E-8DE6-1C436E37E8BE@gmail.com> (raw)
In-Reply-To: <20151006101305.GG12635@sirena.org.uk>


> On Oct 6, 2015, at 6:13 AM, Mark Brown <broonie@kernel.org> wrote:
> 
>> On Mon, Oct 05, 2015 at 11:29:56PM -0700, David Miller wrote:
>> From: Mark Brown <broonie@kernel.org>
> 
>>> Dave, to be clear please do *not* apply this patch at least for the time
>>> being - I've not reviewed it or the one from Thursday that you applied
>>> this morning.
> 
>> It's applied, it's pushed out to my tree, and therefore this will need to
>> be fixed up with a relative patch of some sort.
> 
> This appears to be an incremental change, not the initial commit which
> you already applied.  I'm asking you to stop applying changes to regmap
> which have not been reviewed.
> 
>> What you don't seem to understand is that my GIT tree is never rebased
>> or mangled because many people depend upon it.  So once a patch is
>> applied, that commit lives on forever.
> 
> I'm not *so* concerned if the patch lives in history, I'm concerned with
> having something I can sensibly review and ideally getting the code into
> my tree.

I would suggest the following course of action:

1) David, revert the following from net-next:
$ git revert 9886ce2b9d4e5a8bb3d78d0f7eff3c0f1ed58d67
$ git revert 04fbfce7a222327b97ca165294ef19f0faa45960
$ git revert 7741c373cf3ea1f5383fa97fb7a640a429d3dd7c

2) Mark, please use the patch titled "[PATCH net-next v3 1/2] regmap:
Allow installing custom". It will apply cleanly to the regmap for-next
branch
3) Once Mark has accepted this patch into the regmap tree, I will make
any adjustments needed to the net-next patch.
4) David should then merge the regmap for-next branch into net-next
5) I will submit a new patch to net-next for the encx24j600 driver
that should build against the regmap changes

Sound like a good plan?

-Jon

  reply	other threads:[~2015-10-06 12:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-05 13:29 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 [this message]
2015-10-06 13:25         ` David Miller
2015-10-06 14:31           ` Mark Brown
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=ABC562FD-5DE5-452E-8DE6-1C436E37E8BE@gmail.com \
    --to=jonringle@gmail.com \
    --cc=broonie@kernel.org \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=jon@ringle.org \
    --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

all inboxes | Powered by JetHome®