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: <55a2d67f-9a12-9fe6-d73b-8c3f5eb36f31@kernel.dk>
Date:   Mon, 5 Sep 2022 18:18:53 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: New topic branch for block + gup work?
Content-Language: en-US
To:     John Hubbard <jhubbard@nvidia.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Logan Gunthorpe <logang@deltatee.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Christoph Hellwig <hch@infradead.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc:     LKML <linux-kernel@vger.kernel.org>, linux-mm@kvack.org,
        linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org
References: <86266dcc-d475-7cd4-77dc-a8ba6f11620b@nvidia.com>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <86266dcc-d475-7cd4-77dc-a8ba6f11620b@nvidia.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 9/5/22 5:16 PM, John Hubbard wrote:
> Hi Jens,
> 
> After you suggested a topic branch [1] as a way to address the recent
> bio_map_user_iov() conflict in linux-next, I've reviewed a few more
> patchsets in mm, and am now starting to suspect that a topic branch
> would be ideal here.
> 
> Logan's "Userspace P2PDMA with O_DIRECT NVMe devices" series [2], my
> "convert most filesystems to pin_user_pages_fast()" series [3], and the
> block layer change from [1], all conflict in iov_iter*, and in
> bio_map_user_iov().
> 
> Less of an issue but still worth considering, Dan's "Fix the DAX-gup
> mistake" series [4] conflicts in gup.c, too.
> 
> Maybe:
> 
>     gup_bio
> 
> , or something like that, as a topic branch?
> 
> Everyone: thoughts, preferences here?

My suggestion would be to branch from for-6.1/block, then we can
apply the gup patches on top of that. I'd probably just call it
for-6.1/block-gup.

-- 
Jens Axboe