From patchwork Wed Mar 22 23:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 73692 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2619336wrt; Wed, 22 Mar 2023 16:11:01 -0700 (PDT) X-Google-Smtp-Source: AK7set+REGgMDeW9Cc9j8TcU8tPzOvjx+NNXXkIHwfQ7bVvBgffhvAgNlglRbYUjFWWSjJUfwqOg X-Received: by 2002:a17:907:6e8e:b0:923:c55d:efd2 with SMTP id sh14-20020a1709076e8e00b00923c55defd2mr10695570ejc.68.1679526661264; Wed, 22 Mar 2023 16:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679526661; cv=none; d=google.com; s=arc-20160816; b=LoWvfG3ZAkzdYhNXwlOLdokNN1KTOJciPQ5scDJtZDz+WDs4K+akIUemPhxGk1HzQa zSL0tsqWwFep1VN32K+Hc/nknws5Wq5GV3IE3B1uImO41E1UIA5T2HfOheB1NbVFZ0Hf g50SB5lzYOF6avUkltuGra6ytq/ajirsSFbbvSStkhLglt5h4TL5h8QFfcOvvVLjZgCW mPIYCnDr996F0h4D3eeEAoO0GhNoeg7Yz95yVzA7Fnp/pA8LYbdvwvcwrf/orOH64Y8o sxzIAEPvkouLQPiX+Ru712p3r8X+TFXR6UPPOhhKhBFRPgunwBjAcdBYL3ZRZeauklVE lTgA== 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=rsjvqVJpvHhn9wRdeV5pStst41E897IWLfvCHN97eSk=; b=hbrTgfNI41ePmUx3U2JW/6ikXx8n2ivzM1+EhLlq0uhXd57wGclxSYYCkKmn53OYPs y3dorSPzw4qgi0Q+F+t5pmcNI9Xo/22VWAS4MUCZA7icn28IqEXdM99Qb2viWhpoKoWW 8EShfuHYHg/tf2GwS0i9nPxkSAWG/dzZKT1NgelMAJghoqqIldX3TAp5ShjuvXQacCEN QGkt2ZtFcf1gdqQvSz5aTWKElMjfZaIbfn3fLZiz3yVkRkwmJDMQ0yvrCYM4E+c5moBE NEt+nLu/LZe/AZjcZ2jngIkaUPiZlvJtK5SOorEf3YhUS7fe5WUiR1BKOdBvMkRytk7m mH4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="b/1l+aN6"; 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=auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i19-20020a170906851300b008ccf9fd2186si14849748ejx.867.2023.03.22.16.10.34; Wed, 22 Mar 2023 16:11:00 -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="b/1l+aN6"; 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=auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229529AbjCVXCL (ORCPT + 99 others); Wed, 22 Mar 2023 19:02:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229497AbjCVXCJ (ORCPT ); Wed, 22 Mar 2023 19:02:09 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AB7B6588; Wed, 22 Mar 2023 16:02:07 -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 4PhkWK5Wy0z4wgv; Thu, 23 Mar 2023 10:02:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1679526126; bh=rsjvqVJpvHhn9wRdeV5pStst41E897IWLfvCHN97eSk=; h=Date:From:To:Cc:Subject:From; b=b/1l+aN6FdtzsGnJeU4vZ6zfMymHuKX1qf4TrxKM93Q1oH0DApKA9+8YbQlCYOcP8 XUqBXrZhkanYla8b7fc8hw2YrwE6BQiZImi7723RXJU2SKTCgZplo2koP6LVFL9hqc CfxZxGcuGxXgFqsi2DEyZs88cXLhesPj8hdiqyuPPB5EvM48fIouujekuu+TwjadFc AYWiZ8IlRYLuySQmur8TpFcQ7aOjSzFV5y5NvzHV096sQfWb8c4I/PXPLtIzKI9J/F vCB00TtLdLu8X5hXAQoCyBAHqIYLhtk0xrtd+DhCeWMIRTl5iBVT3fX4gxV7q77N5s bBnFoVxRB0zrw== Date: Thu, 23 Mar 2023 10:02:04 +1100 From: Stephen Rothwell To: Jens Axboe , Andrew Morton Cc: David Howells , Linux Kernel Mailing List , Linux Next Mailing List , Lorenzo Stoakes Subject: linux-next: manual merge of the block tree with the mm tree Message-ID: <20230323100204.0917cecf@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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?1761111348211612566?= X-GMAIL-MSGID: =?utf-8?q?1761111348211612566?= Hi all, Today's linux-next merge of the block tree got a conflict in: lib/iov_iter.c between commit: c4cf24ce34b7 ("iov_iter: add copy_page_to_iter_atomic()") from the mm tree and commit: a53f5dee3448 ("iov_iter: Kill ITER_PIPE") from the block tree. I fixed it up (see 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. Signed-off-by: Lorenzo Stoakes Signed-off-by: Andrew Morton diff --cc lib/iov_iter.c index 48ca1c5dfc04,fad95e4cf372..000000000000 --- a/lib/iov_iter.c