[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <YnobgCqs3nUe39XL@equinox>
Date: Tue, 10 May 2022 09:00:00 +0100
From: Phillip Potter <phil@...lpotter.co.uk>
To: Jens Axboe <axboe@...nel.dk>
Cc: Jonathan Corbet <corbet@....net>,
Paul Gortmaker <paul.gortmaker@...driver.com>,
linux-kernel@...r.kernel.org, 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 05:17:13PM -0600, Jens Axboe wrote:
> On 5/9/22 5:03 PM, Phillip Potter wrote:
> > 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.
>
> I'm fine with taking these, and if they need fixing up then all the
> easier, but patches from maintainers should be sent in well before the
> merge window opens. For doc updates it's not that important, but please
> do send them in at least a week before 5.18 final happens.
>
> --
> Jens Axboe
>
Hi Jens,
Thanks, I'll make sure this gets done.
Regards,
Phil
Powered by blists - more mailing lists