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: <20200601125052.GD45647@sirena.org.uk>
Date:   Mon, 1 Jun 2020 13:50:52 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Alexandre Belloni <alexandre.belloni@...tlin.com>
Cc:     Vladimir Oltean <olteanv@...il.com>,
        "David S. Miller" <davem@...emloft.net>,
        netdev <netdev@...r.kernel.org>, Andrew Lunn <andrew@...n.ch>,
        Vivien Didelot <vivien.didelot@...il.com>,
        Florian Fainelli <f.fainelli@...il.com>,
        Antoine Tenart <antoine.tenart@...tlin.com>,
        Microchip Linux Driver Support <UNGLinuxDriver@...rochip.com>,
        Alexandru Marginean <alexandru.marginean@....com>,
        Claudiu Manoil <claudiu.manoil@....com>,
        "Madalin Bucur (OSS)" <madalin.bucur@....nxp.com>,
        radu-andrei.bulie@....com, fido_max@...ox.ru
Subject: Re: [PATCH v3 net-next 01/13] regmap: add helper for per-port
 regfield initialization

On Mon, Jun 01, 2020 at 01:51:31PM +0200, Alexandre Belloni wrote:
> On 01/06/2020 14:12:38+0300, Vladimir Oltean wrote:

> > In my mind I am not exactly sure what the pull request does to improve
> > the work flow. My simplified idea was that you would send a pull
> > request upstream, then David would send a pull request upstream (or
> > the other way around), and poof, this common commit would disappear
> > from one of the pull requests.

> No, this would make you commit appear twice in the history with
> different hashes. If you want to have what you suggest, Dave needs to
> first take Mark's PR so both PR will have the same commit hash.

Right, in general you shouldn't resend patches which have already been
applied especially not to other maintainers.  It causes confusion like
we saw earlier with Dave applying the patch again (fortunately it seems
that he reverted it).  As well as the duplicated commits this is often a
source of merge confilicts if any changes are made on top of the patch.  

I've now sent my pull request for this cycle so it should appear in
v5.8-rc1 but in case Dave is still applying stuff even after the merge
window opened:

The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:

  Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git tags/regmap-per-port-field

for you to fetch changes up to 8baebfc2aca26e3fa67ab28343671b82be42b22c:

  regmap: add helper for per-port regfield initialization (2020-05-29 13:44:30 +0100)

----------------------------------------------------------------
regmap: Add per-port field initialization helpers

----------------------------------------------------------------
Vladimir Oltean (1):
      regmap: add helper for per-port regfield initialization

 include/linux/regmap.h | 8 ++++++++
 1 file changed, 8 insertions(+)

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ