From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5853ECAAD1 for ; Thu, 1 Sep 2022 14:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233562AbiIAOKs (ORCPT ); Thu, 1 Sep 2022 10:10:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234336AbiIAOKo (ORCPT ); Thu, 1 Sep 2022 10:10:44 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 818B55C9E7 for ; Thu, 1 Sep 2022 07:10:41 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id z72so14641268iof.12 for ; Thu, 01 Sep 2022 07:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date; bh=CyNbcV14q7+Ey6YxeCBNqSaJlRng0kSUQ5nxtXoFaWw=; b=itCLQCZh1QpRBU5xvMrj8jVtI7BFXtZrqghFjObvPTJEwX/myKCtUa06ux69XiK40k zHD/t9DCgq3GaiBEpkDFyIscNooeqQUW7LJVQjh8StipOeLYe0v1b2LDITxzyLPwToPd RJ9Mr8NJtfLFbKhiEKyHopiL87afugpNN1N4oMql+/WunNTadE0NeQBld1254ENxtx1f 61aAIbaPu9wv3t8fJOf1mZznGAn5XGqamu9PpPNhLcrpz/sRjZJ+6sFzDVvsXUW8oafT /B26hLoWR3jkHb3fyDyoOHPoxTWEnAkqGU8Wvl0ZUiOnXdnGwCpj8Y5xrFD62CkQV7Hn Gj7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=CyNbcV14q7+Ey6YxeCBNqSaJlRng0kSUQ5nxtXoFaWw=; b=Nop+N3gsnSHqO4T2PLx2VNA2yT0n5U4rBPus5ilcELSkws60aNCDkcMMx9odiGm3k9 ZJ7vNiOByCb7+0KeSLhc7i3w/saJtvAWOIllYpb8TSIbysN6491dnkCpOkOhyf0Elhl5 GYQrzdHJyejPCEnSJs/LqqTD69PU1kiH+dws0W3znZhL5sc47kjsek4xnzXs0piqITZu MhDLim351RcjlqeUHnyoRBBYax1IIFwYj+3dANWEjiL4YrDMVpvuiJ6Aep+N4eLM8IZS rXGDuH9wfpJsKHbWfTyYUmyNWYfdMbina4+sRHclVLiNL9TH69WR5TrscddBpvSFzD/5 Z18A== X-Gm-Message-State: ACgBeo0grT7nCF/dFNQgyI+f8YuCuHF9La3LkkesKY+3nFagt1+drRh6 43hG2hXzp/P5WwP90ow0Vr2pJA== X-Google-Smtp-Source: AA6agR694CqwSaixSBdSD1iR4/wSRdBsicWKndEbSHznwNc8FNkXNt0eNbj1fmhOMkrdMjEys9Oxww== X-Received: by 2002:a6b:6704:0:b0:688:d06b:2233 with SMTP id b4-20020a6b6704000000b00688d06b2233mr15215106ioc.174.1662041440723; Thu, 01 Sep 2022 07:10:40 -0700 (PDT) Received: from [192.168.1.94] ([207.135.234.126]) by smtp.gmail.com with ESMTPSA id p9-20020a02b389000000b0034c10bd52f5sm1867543jan.125.2022.09.01.07.10.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Sep 2022 07:10:35 -0700 (PDT) Message-ID: Date: Thu, 1 Sep 2022 08:10:32 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Subject: Re: linux-next: manual merge of the mm tree with the block tree To: John Hubbard , Stephen Rothwell , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List References: <20220901161722.739d2013@canb.auug.org.au> <1a6632f1-5e23-5fb3-1af2-6d653e4338d4@nvidia.com> Content-Language: en-US From: Jens Axboe In-Reply-To: <1a6632f1-5e23-5fb3-1af2-6d653e4338d4@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/1/22 1:47 AM, John Hubbard wrote: > On 8/31/22 23:17, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the mm tree got a conflict in: >> >> block/blk-map.c >> >> between commit: >> >> e88811bc43b9 ("block: use on-stack page vec for <= UIO_FASTIOV") >> >> from the block tree and commit: >> >> 2e9a2aa23dad ("block, bio, fs: convert most filesystems to pin_user_pages_fast()") >> >> from the mm tree. >> >> I fixed it up (I think - see below) and can carry the fix as > > The fix up looks correct to me. > >> necessary. This is now fixed as far as linux-next is concerned, but any >> non trivial conflicts should be mentioned to your upstream maintainer >> when your tree is submitted for merging. You may also want to consider >> cooperating with the maintainer of the conflicting tree to minimise any >> particularly complex conflicts. >> > > Of the 7 patches in my series [1], the first two are in mm, and provide > some prerequisites. The remaining patches apply to block, bio, fs, and > iov_iter, and that's where this merge conflict happened. > > Also, there's still some upcoming churn (more patchset revisions are > coming), as reviews are still active and this one isn't perfected yet. > > 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. -- Jens Axboe