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 2255DEB64DA for ; Mon, 19 Jun 2023 20:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229783AbjFSUZn (ORCPT ); Mon, 19 Jun 2023 16:25:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbjFSUZm (ORCPT ); Mon, 19 Jun 2023 16:25:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03294FE; Mon, 19 Jun 2023 13:25:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8BBF460EF6; Mon, 19 Jun 2023 20:25:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE0D4C433C8; Mon, 19 Jun 2023 20:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1687206338; bh=WAYvKIcP5JGcLoFhs+xJByJUau+tOkVoHGTkkvrP4JU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=0wXaJbOrGQB8I5NagWd0d0bwZnuFr0sqwVgcuephvPeNk8PiIDJ6lAJRWIJ30F2eA Ma2AXZUP278LGHlvO8gKasSqhaH7kP3JiqAIWDa1SUowswj56q4jxDUJ3pm1vlsewf J9RBAQoe+JoYDiibsRs/mGswTn58y/6Z0sad7Ttw= Date: Mon, 19 Jun 2023 13:25:37 -0700 From: Andrew Morton To: Stephen Rothwell Cc: "Liam R. Howlett" , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the mm tree with Linus' tree Message-Id: <20230619132537.d3ae1873ad90e9fed47437d6@linux-foundation.org> In-Reply-To: <20230619092355.133c5cdb@canb.auug.org.au> References: <20230619092355.133c5cdb@canb.auug.org.au> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, 19 Jun 2023 09:23:55 +1000 Stephen Rothwell wrote: > 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. > Thanks, Stephen. We'll push the series "Reduce preallocations for maple tree" into the next -rc cycle, so this issue should go away. These: maple_tree-add-benchmarking-for-mas_for_each.patch maple_tree-add-benchmarking-for-mas_prev.patch mm-move-unmap_vmas-declaration-to-internal-header.patch mm-change-do_vmi_align_munmap-side-tree-index.patch mm-remove-prev-check-from-do_vmi_align_munmap.patch maple_tree-introduce-__mas_set_range.patch mm-remove-re-walk-from-mmap_region.patch maple_tree-adjust-node-allocation-on-mas_rebalance.patch maple_tree-re-introduce-entry-to-mas_preallocate-arguments.patch mm-use-vma_iter_clear_gfp-in-nommu.patch mm-set-up-vma-iterator-for-vma_iter_prealloc-calls.patch maple_tree-move-mas_wr_end_piv-below-mas_wr_extend_null.patch maple_tree-update-mas_preallocate-testing.patch maple_tree-refine-mas_preallocate-node-calculations.patch maple_tree-reduce-resets-during-store-setup.patch mm-mmap-change-vma-iteration-order-in-do_vmi_align_munmap.patch