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 9AF0AC7EE25 for ; Fri, 9 Jun 2023 06:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238031AbjFIGbr (ORCPT ); Fri, 9 Jun 2023 02:31:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230063AbjFIGbn (ORCPT ); Fri, 9 Jun 2023 02:31:43 -0400 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1BA9271D; Thu, 8 Jun 2023 23:31:41 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 142875C0045; Fri, 9 Jun 2023 02:31:41 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute6.internal (MEProxy); Fri, 09 Jun 2023 02:31:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1686292301; x=1686378701; bh=d2 x9IDXlPUYeZLqgaykZutUxT8s5eH1tQ1r8Y+8L+68=; b=S1IhnsGsOg4qXTaRCw Ez9D7ShEyqZdz2NoMsIBloAFlPs4XPzcVsgvvMntgO7x7z/ipzlseiMPaWg0EXb3 P1q148lH/LMqXmtbCG7NN/f2+IVFX4QXGF33vGpL5GH4aY2cN46yeMHGeLPHZuLh M5xdwSBJixJp0ciIYFMGSIka2O+en09ndebA0l/VE3R+yry/ibnonpaPOv3IIzoh YympschJBbMtnh/9I1L/XCUrtF5L6BhkIdmoXvxL5O+LKkzy+fQMa+BXbiA11058 FUEqHM5wGrKvhicf5hwZCEc5Z777veTcz6QBhrbrXRRfZvvUaUc6X+CPYsdXksR6 jMHQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1686292301; x=1686378701; bh=d2x9IDXlPUYeZ LqgaykZutUxT8s5eH1tQ1r8Y+8L+68=; b=CzexGceKdkTjt/E9FFoyUErukUTFg d1eYVb+oFt06Lym/L6rOsMXMps+KOztRPWZvt1rGyxPzjqLe+XzX02ff8mYNmInC 1gnqgo8vOs3kHDG5d6CoXp3rc8IpNX1/DLJE3rRyBJfZteHk5JhvV9EGMyw/Hwgq uyv6hKy8267g4jo85R9Ejx96epJe18q2xmwGarzNmLH4RpsW44j4HwxRhRE7wJsw GbW5iX8dDPB5vuseqJ5cDRPR5D4teLyKDL608MsigBBwWrRFbqEs5WhwYTsQ/N7T rcZITQ+JD6jkC7Sde/aJAMOBzz0PgiV7kJztD3Kt9DHOobds3LGAtR+MA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgedtjedguddtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvvefutgesthdtredtreertdenucfhrhhomhepfdet rhhnugcuuegvrhhgmhgrnhhnfdcuoegrrhhnugesrghrnhgusgdruggvqeenucggtffrrg htthgvrhhnpeffheeugeetiefhgeethfejgfdtuefggeejleehjeeutefhfeeggefhkedt keetffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe grrhhnugesrghrnhgusgdruggv X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 57799B60086; Fri, 9 Jun 2023 02:31:40 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-447-ge2460e13b3-fm-20230525.001-ge2460e13 Mime-Version: 1.0 Message-Id: <7f77f31e-90ff-44ad-9646-9876f11eed13@app.fastmail.com> In-Reply-To: <20230609104037.56648990@canb.auug.org.au> References: <20230609104037.56648990@canb.auug.org.au> Date: Fri, 09 Jun 2023 08:31:19 +0200 From: "Arnd Bergmann" To: "Stephen Rothwell" , "David S . Miller" Cc: Netdev , "David Howells" , "Linus Walleij" , "Linux Kernel Mailing List" , linux-next , "Paolo Abeni" Subject: Re: linux-next: manual merge of the net-next tree with the asm-generic tree Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 9, 2023, at 02:40, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > fs/netfs/iterator.c > > between commit: > > ee5971613da3 ("netfs: Pass a pointer to virt_to_page()") > > from the asm-generic tree and commit: > > f5f82cd18732 ("Move netfs_extract_iter_to_sg() to lib/scatterlist.c") > > from the net-next tree. > > I fixed it up (I used the file from the former and applied the patch > below) and can carry the fix as 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. > > From: Stephen Rothwell > Date: Fri, 9 Jun 2023 10:35:56 +1000 > Subject: [PATCH] fix up for "Move netfs_extract_iter_to_sg() to > lib/scatterlist.c" > > interacting with "netfs: Pass a pointer to virt_to_page()" > > Signed-off-by: Stephen Rothwell > --- > lib/scatterlist.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/scatterlist.c b/lib/scatterlist.c > index e97d7060329e..e86231a44c3d 100644 > --- a/lib/scatterlist.c > +++ b/lib/scatterlist.c > @@ -1237,7 +1237,7 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *iter, > if (is_vmalloc_or_module_addr((void *)kaddr)) > page = vmalloc_to_page((void *)kaddr); > else > - page = virt_to_page(kaddr); > + page = virt_to_page((void *)kaddr); > > sg_set_page(sg, page, len, off); > sgtable->nents++; The fix is correct, but I think this should just get applied in net-next directly, on top of the f5f82cd18732 commit, it will have no effect there but avoid the conflict. Arnd