Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Thu, 5 Oct 2023 10:09:32 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     David Sterba <dsterba@suse.com>, Filipe Manana <fdmanana@suse.com>,
        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 btrfs tree with the btrfs-fixes
 tree
Message-ID: <20231005100932.53c35f2c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/H93Sqh0F6fw6Oc5b84TQeVD";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/H93Sqh0F6fw6Oc5b84TQeVD
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the btrfs tree got a conflict in:

  fs/btrfs/transaction.h

between commit:

  f8d1b011ca8c ("btrfs: always print transaction aborted messages with an e=
rror level")

from the btrfs-fixes tree and commit:

  5483af73c851 ("btrfs: rename errno identifiers to error")

from the btrfs 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/btrfs/transaction.h
index 93869cda6af9,de58776de307..000000000000
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@@ -213,15 -216,15 +216,15 @@@ do {							=09
  	if (!test_and_set_bit(BTRFS_FS_STATE_TRANS_ABORTED,	\
  			&((trans)->fs_info->fs_state))) {	\
  		first =3D true;					\
- 		if (WARN(abort_should_print_stack(errno),	\
+ 		if (WARN(abort_should_print_stack(error),	\
  			KERN_ERR				\
  			"BTRFS: Transaction aborted (error %d)\n",	\
- 			(errno))) {					\
+ 			(error))) {					\
  			/* Stack trace printed. */			\
  		} else {						\
 -			btrfs_debug((trans)->fs_info,			\
 -				    "Transaction aborted (error %d)", \
 +			btrfs_err((trans)->fs_info,			\
 +				  "Transaction aborted (error %d)",	\
- 				  (errno));			\
+ 				  (error));			\
  		}						\
  	}							\
  	__btrfs_abort_transaction((trans), __func__,		\

--Sig_/H93Sqh0F6fw6Oc5b84TQeVD
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUd8KwACgkQAVBC80lX
0GyY2gf/cFoHnUUaAoG++VOskX/gdqgV2nTtk5H5fQWf2uN+yfYSLCp0eofjmT5n
wpeVYzWxvAc8h/cy9gpU1zf7fCoGKKhqHQjOXGxWqXK+odcsCG2aW7U+idEb1kxb
YHAye6G6QVo1l8wtMtk68b/+9StY+hpBjXQ21cu5WhcBA7ZjkxOtLKDjoPAA1jj6
KwM8RqCrDwwhu5D7ywH4vfDudMUyEZnZoOHqwwO1toOBSQrV4wvMpna7nqXL1nUg
99TJV6bO1VrkhbAP06k/CiOV/a7v+cKFDoq0tJ0EEMJnndOCLrbtbWPuI7FsYj5h
mAjAk1TR8a2ijCskygxZzvuDV1CH/Q==
=uhFb
-----END PGP SIGNATURE-----

--Sig_/H93Sqh0F6fw6Oc5b84TQeVD--