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]
Date:   Tue, 10 May 2022 00:03:55 +0100
From:   Phillip Potter <phil@...lpotter.co.uk>
To:     Jonathan Corbet <corbet@....net>
Cc:     Paul Gortmaker <paul.gortmaker@...driver.com>,
        linux-kernel@...r.kernel.org, Jens Axboe <axboe@...nel.dk>,
        Christoph Hellwig <hch@....de>,
        Randy Dunlap <rdunlap@...radead.org>
Subject: Re: [PATCH 3/3] block: remove last remaining traces of IDE
 documentation

On Mon, May 09, 2022 at 04:17:31PM -0600, Jonathan Corbet wrote:
> Phillip Potter <phil@...lpotter.co.uk> writes:
> 
> > I was yes, the point I was trying to make (poorly) is that your patch
> > conflicts with Randy's patch which itself is not yet in linux-next, as
> > normally I send everything together at the start of the merge window to
> > Jens, as I don't have my own kernel.org tree yet, and usually I only get
> > one or two patches in a cycle anyway.
> >
> > This is not your fault, you couldn't have been expected to know this in
> > retrospect, and I should probably look into getting my own tree/GPG key
> > sorted to alleviate this problem in future.
> >
> > In the meantime, if you're comfortable with the idea, I can just resolve
> > the conflict myself when I send the patches onto Jens this time and
> > include patch 3/3 pre-fixed up. Merge window will be fairly soon anyway.
> 
> So I'm a little confused by the state of everything at this point, but
> I'm assuming that I need not worry about taking these changes through
> docs-next.  Please let me know if that's not correct.
> 
> Thanks,
> 
> jon

Dear Jon,

Yes, that's right. Makes sense for the whole series to go together, so I
will fix up patch 3 to apply alongside Randy's patch (which I see you've
taken now) and send the whole lot through to Jens as the merge window
opens. Thanks.

All the best,
Phil

Powered by blists - more mailing lists