Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 3 Aug 2023 11:28:30 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, "Darrick J. Wong" <djwong@kernel.org>
Cc:     Christoph Hellwig <hch@lst.de>,
        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 block tree with the djw-vfs tree
Message-ID: <20230803112830.21c805a7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Buv3IITV=ap.THZsaND54hy";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Buv3IITV=ap.THZsaND54hy
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/super.c

between commit:

  880b9577855e ("fs: distinguish between user initiated freeze and kernel i=
nitiated freeze")

from the djw-vfs tree and commit:

  4a8b719f95c0 ("fs: remove emergency_thaw_bdev")

from the block 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/super.c
index edc588bca7fc,bc666e7ee1a9..000000000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -1029,8 -1029,10 +1029,10 @@@ static void do_thaw_all_callback(struc
  {
  	down_write(&sb->s_umount);
  	if (sb->s_root && sb->s_flags & SB_BORN) {
- 		emergency_thaw_bdev(sb);
+ 		if (IS_ENABLED(CONFIG_BLOCK))
+ 			while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
+ 				pr_warn("Emergency Thaw on %pg\n", sb->s_bdev);
 -		thaw_super_locked(sb);
 +		thaw_super_locked(sb, FREEZE_HOLDER_USERSPACE);
  	} else {
  		up_write(&sb->s_umount);
  	}

--Sig_/Buv3IITV=ap.THZsaND54hy
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTLAr4ACgkQAVBC80lX
0Gy8QQgAjftO2ZUGP9ttUAf7vFwVka82EsCeDhA9uYqiiTOMkcqRy+oEI2ozn1BY
fM6u0zrcFfaxCNXnenU5pspnEoMajzXJj5kd6mxXvMNz8oyROpxj27Tx/2Ni1hC1
Qzsdx3B3QF1Qhg7ubUzZ9YN4Nw2AaR/Yqlof1nmAAOPApcdBgd7nhGwPJRrkceh1
glRMDbt2HPv1JAs9T1BWGAm1pqBtANw15vmeSgxBVHS6VMMAsF8W5kFH/UedwdHQ
vR5QBWSD26UK92oPL/lsPuDFDTPIYEKQhpJQB+vKLs2cqik0zhABqAk87JCPc5Nf
5FB+Dg984wMlnnJ5Ky8yuib/v6WF7A==
=PmkS
-----END PGP SIGNATURE-----

--Sig_/Buv3IITV=ap.THZsaND54hy--