From patchwork Tue Aug 22 23:38:52 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: 13361523
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 88B0AEE49B1
	for <linux-xfs@archiver.kernel.org>; Tue, 22 Aug 2023 23:38:57 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230163AbjHVXi5 (ORCPT <rfc822;linux-xfs@archiver.kernel.org>);
        Tue, 22 Aug 2023 19:38:57 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38072 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229890AbjHVXi5 (ORCPT
        <rfc822;linux-xfs@vger.kernel.org>); Tue, 22 Aug 2023 19:38:57 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A685CD7;
        Tue, 22 Aug 2023 16:38:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1692747534;
        bh=yZs+o7fq+3ECzw1nBRtgOPe68rPMKRQ0lFhjxf9Nc5Q=;
        h=Date:From:To:Cc:Subject:From;
        b=o6tm0f2CCnCgPOlhxtk00vQ6IK9BhdJjQlUSQdxvNcest3kZIYf59Kh7c4scxSFJa
         Wf+TTmBxN/B0zMjpcGej4h4PX6YNMsKwCdXDg2ZhmIkt7Op9r0rysS8eP1OyS4mamY
         RNdEH+demzT+g5OFLQbg1+lI6+Apmb0LRWrcrNfjejEmSntux5XmCd1+Oxf1aV6prD
         BaIvmvLz863ztQ6c+wOfA48W6PTjlNHOaVpFVARJ5dx+Nco+xTH3ZHda/Kah/nYTyA
         zLTjid8WngMPIYGG7tuKgy4IEJfbLehYwGJFDMM9mjJcZ6GIHphOPjaM/5+qqTGLf9
         NdwV8ag10i3lQ==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4RVm595VC5z4wxW;
        Wed, 23 Aug 2023 09:38:53 +1000 (AEST)
Date: Wed, 23 Aug 2023 09:38:52 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>,
        "Darrick J. Wong" <djwong@kernel.org>,
        David Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@lst.de>, <linux-xfs@vger.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 vfs-brauner tree with the xfs tree
Message-ID: <20230823093852.7bf03b7e@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 vfs-brauner tree got a conflict in:

  fs/xfs/xfs_super.c

between commit:

  a76dba3b248c ("xfs: create scaffolding for creating debugfs entries")

from the xfs tree and commit:

  35a93b148b03 ("xfs: close the external block devices in xfs_mount_free")

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/xfs/xfs_super.c
index 09638e8fb4ee,c79eac048456..000000000000
--- a/fs/xfs/xfs_super.c