Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <1b504dc0-a5c4-06c8-e7b2-b3a859e15ad9@kernel.dk>
Date:   Mon, 9 May 2022 17:17:13 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: [PATCH 3/3] block: remove last remaining traces of IDE
 documentation
Content-Language: en-US
To:     Phillip Potter <phil@philpotter.co.uk>,
        Jonathan Corbet <corbet@lwn.net>
Cc:     Paul Gortmaker <paul.gortmaker@windriver.com>,
        linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
        Randy Dunlap <rdunlap@infradead.org>
References: <20220427132436.12795-1-paul.gortmaker@windriver.com>
 <20220427132436.12795-4-paul.gortmaker@windriver.com>
 <87wnfaa8ce.fsf@meer.lwn.net> <20220427165917.GE12977@windriver.com>
 <YmsmnGb3JNjH54Xb@equinox> <20220506153241.GH12977@windriver.com>
 <YnVgxEcRTQPu/DHE@equinox> <87bkw6cpvo.fsf@meer.lwn.net>
 <Ynmd23nhC3KHHX1i@equinox>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <Ynmd23nhC3KHHX1i@equinox>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

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@philpotter.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