From patchwork Fri Jun 9 00:40:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 105190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp637138vqr; Thu, 8 Jun 2023 17:57:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wbehjKvAhMXL4CvlJffkvXdbcJpMveSx1N+wck2lmcryQvKSWQ7rE2qlSzhMP1ZGW8JfG X-Received: by 2002:a17:902:ecc5:b0:1b2:3d0f:be33 with SMTP id a5-20020a170902ecc500b001b23d0fbe33mr6586568plh.27.1686272257290; Thu, 08 Jun 2023 17:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686272257; cv=none; d=google.com; s=arc-20160816; b=uJgwVPIlVMNeG14lgLzndqiMRLWiBaCFlXq94Vdd9vxQ3HbByItqA/Iu/YFqhWtaog m9rCHbJfZxjLhko5HPJN7Pug3SCAZN0AraFz3xCdH8te6L7l89p0Co5L0rFJGlrMZX3o at9lqwXfQbRpitYvFl/U4IqaF7e5vhy5uIQSMCXs3uDtn12eRxurwv9vcZaMLb91D74V q/5GCr3LovkstxC8Y4RZfqH3/3UU4nGlYeycQdnWjvt9N8/sTkeqhkYSvR5kbP11BFaG LUE01jeMznBtw7zQ491hy+s8iKT8hqfznIT3HJ9+YyNW8CIeFBozAiy8hOTe0LxcXLec JVbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=N/d6yAoCqDOR/EUBWSzsbrF4pUagpzq/67B3ewK+ELM=; b=y+E10SsYKFj0I/wB8eFS0PQyUn/s0KcIwaAvVNo1kyyGhasxt0hpHCJYl88WBF8UJq pCqA1mXIzyZnGgvtsKy4ZhYo5AQOLbxSslloPqN5sXclwkNvFJvDOSP9Lmn466wVhK3Y u64xoUqYks/5VyqDX1O/hC5axB2AuiLfasDSU8v4GnCV2Asulx/3t/5H63ikpO+sJewh jKlaTQBlWm1wtYgvcw7MQra7M0Cwa7iW+LwlkobyMSJkxtiVJ89zp8WUhmMDfFMxJFOv gNZOQhCUcn9ljlLuCFuFqVtkvAI+O6jMN4illVQid7On7DANB33a32pHYNAj0dljju0h D/rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=D7yo6pdW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r1-20020a170902be0100b001b042d1eccfsi1830374pls.530.2023.06.08.17.57.24; Thu, 08 Jun 2023 17:57:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=D7yo6pdW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236897AbjFIAkt (ORCPT + 99 others); Thu, 8 Jun 2023 20:40:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229673AbjFIAkr (ORCPT ); Thu, 8 Jun 2023 20:40:47 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C312697; Thu, 8 Jun 2023 17:40:44 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Qcj162RQ9z4x42; Fri, 9 Jun 2023 10:40:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686271242; bh=N/d6yAoCqDOR/EUBWSzsbrF4pUagpzq/67B3ewK+ELM=; h=Date:From:To:Cc:Subject:From; b=D7yo6pdWBHVGuqZv+pUFXTIlKkqMWFerXgdKtT2VTKcA9jMtG0UKFIllZ4H4zdaNL byP9XkkY71sDX0Si5f2Hu2tmQvdP2YMUwTeSqhUOrtUsKgUioNByAnXDoOD2UeD96n ypTEJsqM6UTJnCfF1Br7kFIRT0yi/Ut5eWsrBd/HrkQpVKaiw+cz9l3Aq+DwoGeSKv zgvr0FeZvP8f7AtRFA0VGxkK7dqMdkmFwgmn3E105RtNCHIC8i0tG/8oNvBZHjcaVc l6RBErYGVn/ALQcZe8+wQUfn1/17+A2X90vsebIBryiI/rrcRfi5lTcbTs1mnB+wlL CGtK41NvQnIxQ== Date: Fri, 9 Jun 2023 10:40:37 +1000 From: Stephen Rothwell To: David Miller , Arnd Bergmann Cc: Networking , David Howells , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List , Paolo Abeni Subject: linux-next: manual merge of the net-next tree with the asm-generic tree Message-ID: <20230609104037.56648990@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768184618556172168?= X-GMAIL-MSGID: =?utf-8?q?1768184618556172168?= 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++;