From patchwork Sun Jun 18 23:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2685450vqr; Sun, 18 Jun 2023 16:36:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ49UpB1yTekDfm4RaDzgz1dr5f61coQDgtdHM+CFfilhxGRQh4LPTY5+ilhISJq5Vw4CtR1 X-Received: by 2002:a05:6830:1d91:b0:6b2:baf2:30a1 with SMTP id y17-20020a0568301d9100b006b2baf230a1mr5971529oti.33.1687131380091; Sun, 18 Jun 2023 16:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687131380; cv=none; d=google.com; s=arc-20160816; b=FiIPwQVVBa5soVHfK6NCsz8XgcMuziemh4LUWDxDSf3+7xRrFrLgHjvm5oIQiOYKmh PooSveE3IHrcD9T78RZUhuFp+GTksAZociwxWpKIZxvOtqRYWvZBGZ+WzKizq6+ho+Ym Pm8Qt+JAIBVbLXsABCBGM4zTJujqNy1SkFbjSGrkImi29jxdbM7ym5woqZyXuwD6tKJS +aXmG3jXjn0fLBA3j0+ztOKRqTV3mpA5KL3/hwiTXHya7M9HkjqJCEXjMxhKqHDknNx5 TML3L5ywNhTxWPwhQI7tkjwRcF3OKSjON2vL1khbpFNrSAnHcQ4d8gGPPlndYYABAflx O9SA== 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=tQxCQkiyao5+LPgHpUlD4eq7txYSIRHBDxuOjzVkzQk=; b=HojgSOwTgUEbWxAcshEwPNWfzPOonpEA6nvieXISyN10PPNw8fU6V2GMiEWiqQT+m4 VO6SILl/yAAESmAhHopeaDkVCm+uA7VfoOfpHWfiCZ+IQQEeueVLoNqH86SHHjyYDJrI R89YsN1kp/UdFpx8rcezFZZ6lBslS/V8HNjEdkQv8/ILkcK/YMZUW3HauGLLxz1J9bVq gl+TxDlKizH7q3NTrjgELPeLRM0HuIwKYhJlufrzxnXpaYeIg6LqK+CbRa32u2/GtfGO nKQR0FZ97OT+vopCfwIczJ/kH4QPoiiGOEFnC72eVBnCK3feKb1fwVHqyLOb/GUOHA+A mJFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="TG5jNgm/"; 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 s23-20020a63af57000000b0055386e1eba4si4759434pgo.431.2023.06.18.16.36.00; Sun, 18 Jun 2023 16:36:20 -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="TG5jNgm/"; 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 S229529AbjFRXYJ (ORCPT + 99 others); Sun, 18 Jun 2023 19:24:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjFRXYI (ORCPT ); Sun, 18 Jun 2023 19:24:08 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05234E44; Sun, 18 Jun 2023 16:24:04 -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 4Qkpqx670Zz4wjD; Mon, 19 Jun 2023 09:23:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687130638; bh=tQxCQkiyao5+LPgHpUlD4eq7txYSIRHBDxuOjzVkzQk=; h=Date:From:To:Cc:Subject:From; b=TG5jNgm/Ffajk77yNl7fLWVm/S0d+EjqnBL1kLETDf7tgnqbdmjH9d2MPNkS759Yq zTwmkMQqJdiLrS8SqMJq04A8e7Q3r6Ocw46cYTzlud3kG7cz6LvvfitGRHcU8Jn7bK oMSbUBWRUpTsDxw576QIAgtPJF+57wha2U5UwrHHlq30DEWev/ODwbE7Be1OaeItfB oRrtrzYQ7LaLmijvvMr1KcQWVpIzCLsBCiJECQRV2PvLKR9AxC+56NIITotGVC8ETl EX5TQ4n3WAYKXr5coEKZQ/0nkJ81cX70mY5YfxqEhN4AuoR1rLWlXOvkZMNHSnPtJB ycLV7dzhQPgbg== Date: Mon, 19 Jun 2023 09:23:55 +1000 From: Stephen Rothwell To: Andrew Morton Cc: "Liam R. Howlett" , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the mm tree with Linus' tree Message-ID: <20230619092355.133c5cdb@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 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?1769085473793330633?= X-GMAIL-MSGID: =?utf-8?q?1769085473793330633?= Hi all, Today's linux-next merge of the mm tree got a conflict in: mm/mmap.c between commit: 606c812eb1d5 ("mm/mmap: Fix error path in do_vmi_align_munmap()") from the origin tree and commits: 66106c364147 ("mm: change do_vmi_align_munmap() side tree index") 47b1d8de18f5 ("mm/mmap: change vma iteration order in do_vmi_align_munmap()") from the mm tree. I fixed it up (I think - 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. Tested-by: Ayush Jain diff --cc mm/mmap.c index 98cda6f72605,474a0d856622..000000000000 --- a/mm/mmap.c