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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9119C4332F for ; Tue, 29 Nov 2022 09:15:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 900E310E05E; Tue, 29 Nov 2022 09:15:28 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67D7410E05E for ; Tue, 29 Nov 2022 09:15:27 +0000 (UTC) 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-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-458-rJl4IrXdNfqSv0Z33Oooig-1; Tue, 29 Nov 2022 04:15:24 -0500 X-MC-Unique: rJl4IrXdNfqSv0Z33Oooig-1 Received: by mail-wr1-f72.google.com with SMTP id e7-20020adf9bc7000000b00242121eebe2so1498648wrc.3 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=lOuGXumsz+te9nbsmOmttXKkvL/+e16rre7jIRV4R6sbHRpQkmV/ILaPxnEggpbWlK O4CNntKf0yK3X94WM+UsUr4yY6GatUCUBsgBpqciNi2vI+faBm+hFCx6CEvMiqppRcCZ fxoCbJx6Kv+jFwHlAQL0Z46/EL/JmEQZvFDrMY7IpAjbKvsoSaYtnBoEKl6UlNnEt5R7 vqhshLDNd7KaBiGPhMNArulzaiwGWEpMwCZDCPIFECVi9Xpgop1dMIVpX5QAEv93iupN hrihmn4o2rB0O08bBZIFZxaQpuVGzWIJEiyuXbnMyLVHUPLYpxJGeIEagBbNLpaVHknG bv2Q== X-Gm-Message-State: ANoB5pm6H+lByBE+YHfF6nDoaITkD6S23fNkwUexYEh8dlKVw6/LW6gp /UwSUgadsSagFKU6z7o9ZJB82rMboMkBNkPrKt7nu3uD4Eq4B3kpljKi+YlLVkpyrk+i7UJHkUF afZ0UJ5AXFF85FLtASa2sLSpjtd2X X-Received: by 2002:a05:600c:430c:b0:3cf:8ed7:7124 with SMTP id p12-20020a05600c430c00b003cf8ed77124mr42243418wme.140.1669713323597; 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 To: Hans Verkuil , Andrew Morton 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: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-ia64@vger.kernel.org, Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Nadav Amit , linux-kselftest@vger.kernel.org, sparclinux@vger.kernel.org, Shuah Khan , Marek Szyprowski , Andrea Arcangeli , linux-samsung-soc@vger.kernel.org, linux-rdma@vger.kernel.org, x86@kernel.org, Hugh Dickins , Matthew Wilcox , Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , linux-media@vger.kernel.org, Arnd Bergmann , John Hubbard , linux-um@lists.infradead.org, etnaviv@lists.freedesktop.org, Alex Williamson , Peter Xu , Muchun Song , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Oded Gabbay , linux-mips@vger.kernel.org, Tomasz Figa , linux-perf-users@vger.kernel.org, linux-security-module@vger.kernel.org, linux-alpha@vger.kernel.org, linux-fsdevel@vger.kernel.org, Linus Torvalds , Mike Kravetz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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