From patchwork Thu Oct 26 23:43:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 158704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp242032vqb; Thu, 26 Oct 2023 16:44:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLlJLyHRNE09+e6gVwMYOW4lIcpC9IuTW1jk+yXEOTLE0suvV17s/Emtaq6AObOjhVXhdd X-Received: by 2002:a81:4310:0:b0:5a7:db09:5067 with SMTP id q16-20020a814310000000b005a7db095067mr991640ywa.20.1698363873093; Thu, 26 Oct 2023 16:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698363873; cv=none; d=google.com; s=arc-20160816; b=kyfzuVFfAUbLl3+n0GrDK80tbkVOdJDJJAFwk+NcwKdHnbaZ6Yepl3Bx7iSnvYcm9B kVjlFuVLdanmCZVH+y6cyUmci5GuDYbXFemYvWCVjobY7IVrK4o4JTMdOEVl4pGHpWEw lax7e/+zQpXTQrc835+kf92YRHt5Y+NTzuuyApf5nm3z3RJmVfWMGMJGQu9VN1iVqoeE 3pyIefCJ7N770dxJWIY0/yhedw+zM/H2+eUX17cSHIHOSCGq02w4dCrkMrZBmz4lvGDg MMn2nw80TyOLFFCh4YlOP9wIDPK2hv2DjFBlnbAVVUhamMIBua/KnzWFGmHhCj1VGqk0 WI2Q== 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=9AxyxxmHXdbO5SNsKyyhZSNxBDzNn97yGu6BGF+CUgM=; fh=Rs/cOTXFEHIZGUd6UEprmLZ7hbaSMfl5NYYMB64B3uY=; b=lZHq1EBlsUW5goJgqMn35446+Uwz4YHtt6tpFRTs4CQF6wUy3ddMZbHSutZ1IRA0AD MN90bGIorImHGiXwe1TOt619v7W+5fhBm4nT+U5GuajqR5vINf6q0VayxSTFu6ISNPuy zEXU0DSxKeDGPQCpRILubzva6QP0SsvFNrAr2dS1fwtlPperWgsL2W9vH7Kr1kjVtKn7 +kOyDzus5Vmj5Qetbedrn0thLnW685ZZyeZrouUwrb+S+We7GjRRWTAiZbi5HmfYLyAN 113iC+2gOmdKngkKJuvLOrekFxvBuHVvzriIFN6lfaQWNpTrhZ+SG+F6MqBY1Y17o9UR 9btw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=I6JrqRh5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id f68-20020a0ddc47000000b005a7c656c841si524648ywe.204.2023.10.26.16.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 16:44:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=I6JrqRh5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 755C8836E56B; Thu, 26 Oct 2023 16:44:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231431AbjJZXoH (ORCPT + 26 others); Thu, 26 Oct 2023 19:44:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjJZXoG (ORCPT ); Thu, 26 Oct 2023 19:44:06 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B2211A5; Thu, 26 Oct 2023 16:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698363839; bh=9AxyxxmHXdbO5SNsKyyhZSNxBDzNn97yGu6BGF+CUgM=; h=Date:From:To:Cc:Subject:From; b=I6JrqRh5Pr63FZUzHpJRqPcbEDwJjSRJ649/Ldpb94Uqgpv4eS8geM2IZosgQNBMo K78Kvc2bt+QLakq/PRo5SbVjJ6vSytFnEidHExLeohyYMNpVHvL1Rnq7v4KIFuPWME kzHwR4drbzfdopjrO1scA585Gj8LqPhGM1o4ZAuy7XcAw2VucE9v21CNdFeg8r18qB tnVVRCZugUNym5YLpmtWK8twNutlL7vHe99Ed5+bgE2z2baaB5iWd6nEHYqGPP5AV2 7B19GC2nZGcNgj6Lcdoiw6KOyy6y6Qu4QtnHBm4VSyuI9eMI3IZppPDxoVVrYH3p0L 8oCveFMlITBeA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SGj722xnQz4wcJ; Fri, 27 Oct 2023 10:43:58 +1100 (AEDT) Date: Fri, 27 Oct 2023 10:43:56 +1100 From: Stephen Rothwell To: Christian Brauner , Jan Kara Cc: Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" Subject: linux-next: manual merge of the vfs-brauner tree with the ext3 tree Message-ID: <20231027104356.3fda2bc9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 26 Oct 2023 16:44:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780863596683864026 X-GMAIL-MSGID: 1780863596683864026 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/ext2/dir.c between commits: 1de0736c3af9 ("ext2: Convert ext2_add_link() to use a folio") 7e56bbf15d95 ("ext2: Convert ext2_delete_entry() to use folios") 82dd620653b3 ("ext2: Convert ext2_prepare_chunk and ext2_commit_chunk to folios") from the ext3 tree and commit: 5cdc59fce617 ("ext2: convert to new timestamp accessors") from the vfs-brauner 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. diff --cc fs/ext2/dir.c index 6807df637112,c7900868171b..000000000000 --- a/fs/ext2/dir.c