Re: linux-next: manual merge of the block tree with the drbd tree

["Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>]

Am 25.03.26 um 17:30 schrieb Jens Axboe:
> On 3/25/26 10:07 AM, Christoph B?hmwalder wrote:
>> Jens, how do you want to handle this?
>> Should I send the (technically working, but maybe
>> old-userspace-breaking) DRBD 9 patch series to you so you can carry it
>> in block/for-next? So far I was under the impression that these patches
>> would be too large and unfinished for the block/for-next branch.
> 
> How about this - rebase it against for-7.1/block, and send the series.
> I can stash it in for-7.1/drbd, which can go into for-next. Then the
> separate tree can be dropped.
> 
> I won't submit the changes in for-7.1/drbd, but just expect you to send
> a new series against for-7.2/block when that is a thing. The 7.2 one
> should be closer to going upstream, and so forth. Within a few revisions
> of the mainline kernel, we'll get to the point where for-7.x/drbd can be
> included in the merge window pull request as well, and we're done at
> that point and future drbd changes will just get submitted against
> for-7.x/block like any other block driver.
> 
> ?
> 

Sounds like a plan. I'll send the rebased series this week.
We already have a few "get it closer to going upstream" patches in the
pipeline targeted for the 7.1 and 7.2 merge windows, but none of them
are truly ready yet. So this approach would fit very well.

Exactly, once we are done with all this we will adopt a "normal"
upstream-first dev approach again. We've already discussed changes to
our internal workflow to make sure we never digress this far from
upstream again -- I think that's in all our interests :)

Thanks,
Christoph

-- 
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA —  Disaster Recovery — Software defined Storage