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 E1474C47089 for ; Tue, 29 Nov 2022 09:08:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231733AbiK2JIz (ORCPT ); Tue, 29 Nov 2022 04:08:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229730AbiK2JIx (ORCPT ); Tue, 29 Nov 2022 04:08:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00A572BC5; Tue, 29 Nov 2022 01:08:51 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90112615FC; Tue, 29 Nov 2022 09:08:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EBBAC433D6; Tue, 29 Nov 2022 09:08:43 +0000 (UTC) Message-ID: Date: Tue, 29 Nov 2022 10:08:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH mm-unstable v1 16/20] mm/frame-vector: remove FOLL_FORCE usage Content-Language: en-US To: David Hildenbrand , 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: Hans Verkuil In-Reply-To: <22b1107b-0acc-5772-a883-8f3c4682eb1b@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 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. Also, the updated changelog in David's patch that sits on top of mine makes a lot more sense. If you really don't want to take my patch as part of this, then let me know and I'll take it through the media subsystem and hope for the best :-) Regards, Hans >> >> But Linus won't be editing changelogs so that the changelog makes more >> sense after both trees are joined.  I'm inclined to let the changelog >> sit as it is as well. > > Works for me. Thanks Andrew! >