From patchwork Tue Aug 22 23:33:47 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: 13361521
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 33A11EE49AE
	for <linux-xfs@archiver.kernel.org>; Tue, 22 Aug 2023 23:33:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231743AbjHVXdz (ORCPT <rfc822;linux-xfs@archiver.kernel.org>);
        Tue, 22 Aug 2023 19:33:55 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57002 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231186AbjHVXdz (ORCPT
        <rfc822;linux-xfs@vger.kernel.org>); Tue, 22 Aug 2023 19:33:55 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB1DCD2;
        Tue, 22 Aug 2023 16:33:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1692747228;
        bh=q6j/KxtBlK4gZCeuVgntSaMDfxQEmnWvX0YkGGUDCAY=;
        h=Date:From:To:Cc:Subject:From;
        b=GUwF3YHg5chrxUcUnTKxJ3cuoPk9iwe8TGL2qF3qW2Q/tfDHxrezCJ4r7ZGUzdB3k
         mP8aZ4vop5aRrWpRAspAzO/4Us/TtnNfaojavKa5XoMHPikD5j2tnUneBbhT3B9Ctt
         maZ1YCS71Im2mCTYrikLAaYxODPhaIeJ5YD0Y6nDiNmgA4je33iHxI5EXeEDvc4UJh
         wdUsIy9bJhN0u7qNuudDdpRrgc+TvDB1piKzfBeOwNRd6OExyEJXMhUdpzmEL/YeJj
         N1d7YgXhdTz9+qsQ9aOye6Npxl/qfQ0QPe6MjRrLl/IxIHJv4aE5GHr5n7t16rVpGW
         YP6uoz4mgiYTQ==
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 4RVlzJ23cdz4wxn;
        Wed, 23 Aug 2023 09:33:48 +1000 (AEST)
Date: Wed, 23 Aug 2023 09:33:47 +1000
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>,
        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 djw-vfs tree with the xfs tree
Message-ID: <20230823093347.775f3857@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 djw-vfs tree got a conflict in:

  fs/xfs/scrub/scrub.c

between commit:

  526aab5f5790 ("xfs: implement online scrubbing of rtsummary info")

from the xfs tree and commit:

  ce85a1e04645 ("xfs: stabilize fs summary counters for online fsck")

from the djw-vfs 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/scrub/scrub.c
index e92129d74462,a0fffbcd022b..000000000000
--- a/fs/xfs/scrub/scrub.c