From patchwork Tue Oct 31 00:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2598285vqb; Mon, 30 Oct 2023 17:42:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuN+fQL9i3ygoyrocBCD0geLIClRdp4pX90DKod1h0EJ9TDyJoBcL8eqB5c3LN57jMZ2Hq X-Received: by 2002:a05:6808:208a:b0:3b5:65b0:425 with SMTP id s10-20020a056808208a00b003b565b00425mr219780oiw.21.1698712968274; Mon, 30 Oct 2023 17:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698712968; cv=none; d=google.com; s=arc-20160816; b=NBmH0imu5nfx+AEcTUqr+OEDgiiLagPROIsivvT3pza/j71egVZPd94spTnLt+fYPu VErHnmVB1hAU7DFUJbEP5lHoaQ9p7IG2dsABc9pgNZoqO5xMQGsmIix6kHkwxFwZknU+ Z1ONCi2VPZy4y7IbSFS0j0AIbtx24LskOPieIcK6UeACP4WlC67tS3irgbyBzhviOhNS u69ZNQE0iNLFfRdLBvBRcBjBz5pXwCQtDQyV4TIlYdQ1zNxFwCYgaB+am+1pp+d+Y2Ok ZBmtB93YS0Krs0YU+cs1IK2meTuBcOJb48eQq6ijYP9UhtuApmHZXT+Xh0kbnnrIm62a 8pUA== 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=a4Hxqx+0CTVyusPauQe/h3KF1jX5MmLk6nH3Dh6Ja8A=; fh=UzyU1SPP0P1r94bc0Yj7oWP/crrMFbYRgHonCPkzFW0=; b=tKxRRHtdrHN5Y3YkjLn4J8892MZS9sfVp+bW6yCVlDjFmT3JAbHBx2EXyu3tvC1DS3 y+RcC0D9le4Txijde1fSiAHlMqvBMXVU4SF15LUfxeuxDOuI+JwEKufGbzfoavG4BXIR mo8KKTPCoDCywib6FH1HHobznNODE25oT92cGrSI2RGshTUjJs7D7hKYTsHsx9hEaUAY 2rKwgRZHZsIb4fioHzqz3mrS4DeCFSnSq/XCHAvWGRsvikMLHHBK9/nc1y7X+zvTNHeC XiheRnRoxt9o0uM2HC+OMtRadkHZx1vG08tjMb7FFhUnWn7Dk4sWm8LQGJOv92eLiV7e OieQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=twHymCGc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x3-20020aa79403000000b006901a8f5dadsi163747pfo.289.2023.10.30.17.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 17:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=twHymCGc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 2DF3D802AF28; Mon, 30 Oct 2023 17:42:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236805AbjJaAmL (ORCPT + 33 others); Mon, 30 Oct 2023 20:42:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbjJaAmK (ORCPT ); Mon, 30 Oct 2023 20:42:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 886EB98; Mon, 30 Oct 2023 17:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698712919; bh=a4Hxqx+0CTVyusPauQe/h3KF1jX5MmLk6nH3Dh6Ja8A=; h=Date:From:To:Cc:Subject:From; b=twHymCGcm4HUckrQ+IjBCqJXNgzCc9UVUuJWYoBwmQtk0ggHc/EpwQyn6ALsrMvEs W7uaI4ewueSJkQY24bPDqi1Wm2TOJaOTpxdj+H7pXUZs3Fx03pacs+dtWw/AH0OJsd ITIZp1VITPWUv6RMMilGAdyOeCIAy0ABMMOpPvi1ihha5sqIRR+iYrodXJfkWmUvK7 z9lmX5K48R1JiMViecxVmzPqjMepMerWPtzvQxNb+VAFR6kQZtB+jGG8HbGADRUrow TQ+Vv684RB38utxHejQ8UKJ97ofQYXkuu2SdL+k8KBHJ93uDtaqMlXBAsACGuhaMDw ynCsbTT4enIsQ== 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 4SKBD734mLz4wd1; Tue, 31 Oct 2023 11:41:59 +1100 (AEDT) Date: Tue, 31 Oct 2023 11:41:58 +1100 From: Stephen Rothwell To: "Darrick J. Wong" , David Chinner Cc: , Christian Brauner , Dave Chinner , Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the xfs tree with Linus' tree Message-ID: <20231031114158.548ff433@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,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 30 Oct 2023 17:42:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781229649810701219 X-GMAIL-MSGID: 1781229649810701219 Hi all, Today's linux-next merge of the xfs tree got conflicts in: fs/xfs/libxfs/xfs_rtbitmap.c fs/xfs/xfs_rtalloc.c between commit: 75d1e312bbbd ("xfs: convert to new timestamp accessors") from Linus' tree and commit: 41f33d82cfd3 ("xfs: consolidate realtime allocation arguments") a684c538bc14 ("xfs: convert xfs_extlen_t to xfs_rtxlen_t in the rt allocator") 2d5f216b77e3 ("xfs: convert rt extent numbers to xfs_rtxnum_t") from the xfs 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/xfs/libxfs/xfs_rtbitmap.c index 396648acb5be,b332ab490a48..000000000000 --- a/fs/xfs/libxfs/xfs_rtbitmap.c diff --cc fs/xfs/xfs_rtalloc.c index 2e1a4e5cd03d,ba66442910b1..000000000000 --- a/fs/xfs/xfs_rtalloc.c