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 58983C4332F for ; Tue, 29 Nov 2022 09:16:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229650AbiK2JQ3 (ORCPT ); Tue, 29 Nov 2022 04:16:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229732AbiK2JQX (ORCPT ); Tue, 29 Nov 2022 04:16:23 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4508A57B75 for ; Tue, 29 Nov 2022 01:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669713326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kLZwFc2T16+VzxzvdeqP7dZ+DZAGfAAiD+u0EUrSQ8s=; b=OvXTU6p0Ct0GG3VEsw6AOZSjwusuY/Ng6cuNku1asLSrx9F6Mc66uLvd7qxMRAZbOAL+J5 Q8DdnyjmltiPLfDTqjLE3SaozLtbjrW5pWS5w+X7WF2iZ/48KkE540YFRqNv9Zfo0kmyyh pze47cOZYmn8QXjChvz5wyc79I3BaI4= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-395-2qF4_ILeNjGEINtmYd53kg-1; Tue, 29 Nov 2022 04:15:24 -0500 X-MC-Unique: 2qF4_ILeNjGEINtmYd53kg-1 Received: by mail-wm1-f69.google.com with SMTP id bi19-20020a05600c3d9300b003cf9d6c4016so9882658wmb.8 for ; Tue, 29 Nov 2022 01:15:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kLZwFc2T16+VzxzvdeqP7dZ+DZAGfAAiD+u0EUrSQ8s=; b=JSu5w5xY549+JwwhA4yVrxMnn5ZvVpFyumV5wg+W3p2ZEAKy7iei7vTwJ/MOpfe1Ar pSexPTQEVzcusaAOcv/SwD7N787rQg+2A7aTdDngnZFgrHpW4UMlvlxDXi6RR06IW7cE 3bbVMnBCOpKnhPDTc3WrOBeNT2JRnTyi9fgiveIucILZFZ2DpA2ggzy5b0NrA5AYUIJ1 FU91aWsd1km/DoZGhvi0t6eqNtwIyYNgL9ImoD1ENSXuyj56vM8WtR7iYwXidDTd1yWp GvvlKNLaXiVvNTYC9MUIGvjyPdM+t30jEHpi5pg+JG0v/lfkMZ6NdV4VrFJwWZHJvwAh 3x/A== X-Gm-Message-State: ANoB5plG4rndsMQfc1EF1dPvzhUTllHQMXu6MMvfha77fKGO5QLV2++W 9sW5WSbx3TDirY7lM3mjQmN1BciB5eYjKv6RO66ha1bGd4scZ72Ig5PbvmRsRvqcxI/7vu0PalH IgTdU57rMKgVtYIf28tigjtXt4A== X-Received: by 2002:a05:600c:430c:b0:3cf:8ed7:7124 with SMTP id p12-20020a05600c430c00b003cf8ed77124mr42243404wme.140.1669713323594; Tue, 29 Nov 2022 01:15:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf5aMoFyhfTZRz6WGw0GcgDkcONZAiRyZAh+e0PFHXmVnEtFtgvwKaxuOXbIxhdoVgI1OB8H+Q== X-Received: by 2002:a05:600c:430c:b0:3cf:8ed7:7124 with SMTP id p12-20020a05600c430c00b003cf8ed77124mr42243382wme.140.1669713323266; Tue, 29 Nov 2022 01:15:23 -0800 (PST) Received: from ?IPV6:2003:cb:c705:ca00:3fb8:c253:3bf7:b60e? (p200300cbc705ca003fb8c2533bf7b60e.dip0.t-ipconnect.de. [2003:cb:c705:ca00:3fb8:c253:3bf7:b60e]) by smtp.gmail.com with ESMTPSA id n26-20020a05600c3b9a00b003c6b70a4d69sm1498998wms.42.2022.11.29.01.15.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Nov 2022 01:15:22 -0800 (PST) Message-ID: Date: Tue, 29 Nov 2022 10:15:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH mm-unstable v1 16/20] mm/frame-vector: remove FOLL_FORCE usage Content-Language: en-US To: Hans Verkuil , Andrew Morton Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-perf-users@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kselftest@vger.kernel.org, Linus Torvalds , Jason Gunthorpe , John Hubbard , Peter Xu , Greg Kroah-Hartman , Andrea Arcangeli , Hugh Dickins , Nadav Amit , Vlastimil Babka , Matthew Wilcox , Mike Kravetz , Muchun Song , Shuah Khan , Lucas Stach , David Airlie , Oded Gabbay , Arnd Bergmann , Christoph Hellwig , Alex Williamson , Marek Szyprowski , Tomasz Figa , Mauro Carvalho Chehab References: <20221116102659.70287-1-david@redhat.com> <20221116102659.70287-17-david@redhat.com> <81fb0fa3-2e06-b765-56ac-a7d981194e59@redhat.com> <08b65ac6-6786-1080-18f8-d2be109c85fc@xs4all.nl> <9d0bf98a-3d6a-1082-e992-1338e1525935@redhat.com> <20221128145927.df895bf1966cfa125cae9668@linux-foundation.org> <22b1107b-0acc-5772-a883-8f3c4682eb1b@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On 29.11.22 10:08, Hans Verkuil wrote: > On 29/11/2022 09:48, David Hildenbrand wrote: >> On 28.11.22 23:59, Andrew Morton wrote: >>> On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand wrote: >>> >>>>> Less chances of things going wrong that way. >>>>> >>>>> Just mention in the v2 cover letter that the first patch was added to >>>>> make it easy to backport that fix without being hampered by merge >>>>> conflicts if it was added after your frame_vector.c patch. >>>> >>>> Yes, that's the way I would naturally do, it, however, Andrew prefers >>>> delta updates for minor changes. >>>> >>>> @Andrew, whatever you prefer! >>> >>> I'm inclined to let things sit as they are.  Cross-tree conflicts >>> happen, and Linus handles them.  I'll flag this (very simple) conflict >>> in the pull request, if MM merges second.  If v4l merges second then >>> hopefully they will do the same.  But this one is so simple that Linus >>> hardly needs our help. > > It's not about cross-tree conflicts, it's about the fact that my patch is > a fix that needs to be backported to older kernels. It should apply cleanly > to those older kernels if my patch goes in first, but if it is the other way > around I would have to make a new patch for the stable kernels. IIUC, the conflict will be resolved at merge time and the merge resolution will be part of the merge commit. It doesn't matter in which order the patches go upstream, the merge commit resolves the problematic overlap. So your patch will be upstream as intended, where it can be cleanly backported. Hope I am not twisting reality ;) -- Thanks, David / dhildenb