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: <87d96d36-fd13-2268-122b-fea806090942@nvidia.com>
Date:   Fri, 2 Sep 2022 00:02:19 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.0
Subject: Re: linux-next: manual merge of the mm tree with the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220901161722.739d2013@canb.auug.org.au>
 <1a6632f1-5e23-5fb3-1af2-6d653e4338d4@nvidia.com>
 <f80623f2-7c19-c121-6eff-f5bb4f1cfc48@kernel.dk>
From:   John Hubbard <jhubbard@nvidia.com>
In-Reply-To: <f80623f2-7c19-c121-6eff-f5bb4f1cfc48@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YUJZZXdXWlZNZi8xQ2s4UDltdEcySklEd1RxL2w1d2lnUzlLdmJhN2J1SkJm?=
 =?utf-8?B?Qm9LUnBXeStjczVKNE0vUlMydkZHYzB3YkJIbmNUOG83eUM5Z3N5TjNyeHds?=
 =?utf-8?B?dURWZnZQMExkWGwwcmJZMzA5WG5Wa1JNbHhYNDFFNEZ5MCtlTVZTVUJvSUdm?=
 =?utf-8?B?dmxxbHIyWnFoeG9haTQ1M0Z6TTl5V0pPWnhkcmdUVjhnUVROZGd1U2JNb3VF?=
 =?utf-8?B?S2MxMHNKczU5a3JXQTU2S2FaajBoby8zTnYyTi9FMGMwNUZGenQrazNHdjVl?=
 =?utf-8?B?bkkrKzZhR24yVjFWSnNXenBUZjhKUmEwK2RqV3lkSXRNN2VKZTd4NWdTWTlN?=
 =?utf-8?B?QnFtTWxMbkowUCszRUxlTjRWa1hQWEZJbzIyc3VTb1d3QXVJVFFucUdENS9L?=
 =?utf-8?B?TGRWLzJRcGppNFZmdUt5V2dZK1d5SlBTQUhMeHBQZ0FzaDZkSjd5VW9qWG1J?=
 =?utf-8?B?RlVLdE9rYWdjNURMcU9lSlZsN0NSaEt3Yjdra29qZ1J4UTJoSGQrRmhLZURT?=
 =?utf-8?B?QnY1emxRNytsMmxha2ovYUpxUG1HNEhHSXZyYzZobFFibkJBd003QVMxU0l6?=
 =?utf-8?B?UUJwZXJFWW5sdE1ySkdKcHYxQWVzeVdDcW5UdFFZS0hxWWk5eUJyRmJuVDVP?=
 =?utf-8?B?VGRyS2YvdVVXUXlqSGNaYVd4MFYxeUx0OWhBejZEM2ZtMTVKQndjZWtReTZJ?=
 =?utf-8?B?MmUzdTZzSlBCZUxwT2NXVjVicEpWZmswdG5QNXlsdi9FZEVvQ012YnlUTUdF?=
 =?utf-8?B?R1MvbytlZlRTR2E0bTRVV1FHbHBiSFBTVmhrNzUyZkdsZ05hOWNhTS9LSjRl?=
 =?utf-8?B?VWRMNWdkd0FrRStlUlZ6aW9YV01IS1pLZHEweFN5clFlQWlzQ0QvTy9mUkxo?=
 =?utf-8?B?SXZFQTZ6TUtESndxay9FV0pZbUtTYXdGN3RkR2VVRTRJUmh6OGlGL1V0eURk?=
 =?utf-8?B?Rkk1WUt1U1orQk1hMmpod2RpUHBaVnVpT01Nc1ptUFhsbFQzQlpscVAvb0gw?=
 =?utf-8?B?OEdYdU5LQmh6MCsxWDN4SnlMMlQ3T2h0N3hBYkhjdko4WTZmUjZHR3hxSjhz?=
 =?utf-8?B?S29NM3ZYT21zS1htTnRWME5mM0FjdW9KM0t0eHJ2ZVc0TW1JWnRKZWhJYUZL?=
 =?utf-8?B?eWRaZWliK1ZueEJsdHljWC84QmFXS3lnTWdwd3RUQ3RjSFpWeEFRaFZnNW5I?=
 =?utf-8?B?cEYxRXZvSVBuUVR5VkxaTFZoOXdlZTFuM1hqdzFpQmphdXk5bEcwMm1jekIy?=
 =?utf-8?B?V0ZkY0l2TnQxaDdyUG9hdm9CVXkwcGJRcS80ZjhUaGkzYmUxY0ZmalloYjhv?=
 =?utf-8?B?SGdUalA1UVBLWGk2Y05Pc0VhcHY1Z20zb2d6MHFLZlIweThCTW11aXF1OTJU?=
 =?utf-8?B?S2VMREpYVURYL1hXTlJaNUVtSmRFMzRxUjZUM29YRUI2eTBUbFo0NGRQMmsy?=
 =?utf-8?B?N3lsWUJiZCs0ZHJESGhueTNwSmlwdVRKTWFlV0dDa3gwTElxVlRSYzg5RGc5?=
 =?utf-8?B?cUg4MDNxT2pTdVVUOEloR0RPaHI5bk1EQkRMNng1VzcwR2lkUWVLK2dGK1ky?=
 =?utf-8?B?RzRwUW5vTFJFM2tkdlRweFlRV3JKTG8wK0R1OFYyWCtGMEJGZFNvWFRzRzVk?=
 =?utf-8?B?UTZIaGxzZHVYY2F0ek5FS0RtOEd4QW5qYWhIanNYYW5xd2ZOWDg4aDVtd2ZX?=
 =?utf-8?B?SlU1dldRT21OckpKT3lMaHBHejYwdC9ja2NPcG9KYXhqN1k2d1U2dVRySXBs?=
 =?utf-8?B?NWZyeUNNSXFKb2VicmgybDN5MzJBYnQxRzJvYjROdnRMR2MvRUhnMDdvelMz?=
 =?utf-8?B?ZE9ncUlsUEg5UEZIM09rTzZYQ2xqKzhxeXd3a2R3cmhHdGU0UGZtV2psVU01?=
 =?utf-8?B?L01NZW54M0tTaXBrWHdhdDhWdXRkUmtJWG5HNmwxR1FBMkh6ZE1JSVl6bmF4?=
 =?utf-8?B?RWw3cFl2Z2tzZUlOclBFVFNSZnoycXhoSmdpaTVEOVlRSDhveTJKYW15aXkz?=
 =?utf-8?B?VkpLcGhkTDI2YnI2V1ZXRnRCbDJCQjFVWGFSWUtCUzhBa2hpWTNTVmxrRy9M?=
 =?utf-8?B?eFhVWiszenlUTTMyZVY0U0JmdUNMUVBOVjNlT0oxa1AzdE1TV21DR2pOS3NC?=
 =?utf-8?Q?MPck6JmgTG2WMy4zEJCBWB0TO?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4b91e53-bd1e-47ff-fe76-08da8cb114f9
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 07:02:21.6311
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: X2Fmi1eXFTeYCC7alt3zfA/rB9orlp6OqnYtCHlAeVdeOg4kjuQPV34+f9ZkkSNmFj4Vm0/BO4s5C0tOOV4SgQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6709
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 9/1/22 07:10, Jens Axboe wrote:
>> So I see two obvious solutions. Either:
>>
>> a) Only do the first two patches for now, and leave them in Andrew's
>> tree. After the next release, do the remaining 5 patches via the block
>> tree, or
>>
>> b) Move the whole series to the block tree now, or
>>
>> c) something else?
>>
>> Andrew, Jens, any preference here? 
> 
> Would've been cleaner to take through the block tree given what
> it touches, imho. Or at least base on that, so we'd avoid frivolous
> conflicts like this.
> 

OK, so I'm new to block, and my first guess at the right git tree
and branch:

    git://git.kernel.dk/linux-block block-6.0

 doesn't seem to contain this one:

    e88811bc43b9 ("block: use on-stack page vec for <= UIO_FASTIOV")

Can you point me to the right tree please?

Once I know the right block tree to use, I could post the next version
rebased on top of that. And plan to send it up through Jens' block tree,
assuming that it continues to survive the reviews, that is.

Andrew, is that OK with you? The first two patches will still get
reviewed by mm, and they shouldn't conflict with mm, even if they
go up through the block tree.


thanks,

-- 
John Hubbard
NVIDIA