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 <sfr@canb.auug.org.au>
X-Patchwork-Id: 13440959
Return-Path: <linux-xfs-owner@vger.kernel.org>
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 627E9C4332F
	for <linux-xfs@archiver.kernel.org>; Tue, 31 Oct 2023 00:42:10 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230190AbjJaAmK (ORCPT <rfc822;linux-xfs@archiver.kernel.org>);
        Mon, 30 Oct 2023 20:42:10 -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
        <rfc822;linux-xfs@vger.kernel.org>); 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 <sfr@canb.auug.org.au>
To: "Darrick J. Wong" <djwong@kernel.org>,
        David Chinner <david@fromorbit.com>
Cc: <linux-xfs@vger.kernel.org>,
        Christian Brauner <brauner@kernel.org>,
        Dave Chinner <dchinner@redhat.com>,
        Jeff Layton <jlayton@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the xfs tree with Linus' tree
Message-ID: <20231031114158.548ff433@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-xfs.vger.kernel.org>
X-Mailing-List: linux-xfs@vger.kernel.org

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