Received-SPF: pass (google.com: domain of linux-kernel+bounces-149361-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 18 Apr 2024 10:33:47 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Konstantin Komarov
 <almaz.alexandrovich@paragon-software.com>
Cc: 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 ntfs3
 tree
Message-ID: <20240418103347.2ace95e0@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Utsz1.Tk.jkD.alAdewhe6k";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Utsz1.Tk.jkD.alAdewhe6k
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/ntfs3/ntfs_fs.h

between commit:

  6be30a7aa20b ("fs/ntfs3: Remove cached label from sbi")

from the ntfs3 tree and commit:

  1a2af5ca9b66 ("ntfs3: enforce read-only when used as legacy ntfs driver")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/ntfs3/ntfs_fs.h
index 12c392db5b08,5f4d288c6adf..000000000000
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@@ -1153,28 -1156,6 +1155,30 @@@ static inline void le64_sub_cpu(__le64=20
  	*var =3D cpu_to_le64(le64_to_cpu(*var) - val);
  }
 =20
 +/*
 + * Attributes types: 0x10, 0x20, 0x30....
 + * indexes in attribute table:  0, 1, 2...
 + */
 +static inline const struct ATTR_DEF_ENTRY_SMALL *
 +ntfs_query_def(const struct ntfs_sb_info *sbi, enum ATTR_TYPE type)
 +{
 +	const struct ATTR_DEF_ENTRY_SMALL *q;
 +	u32 idx =3D (le32_to_cpu(type) >> 4) - 1;
 +
 +	if (idx >=3D sbi->attrdef.entries) {
 +		/* such attribute is not allowed in this ntfs. */
 +		return NULL;
 +	}
 +
 +	q =3D sbi->attrdef.table + idx;
 +	if (!q->type) {
 +		/* such attribute is not allowed in this ntfs. */
 +		return NULL;
 +	}
 +
 +	return q;
 +}
 +
+ bool is_legacy_ntfs(struct super_block *sb);
+=20
  #endif /* _LINUX_NTFS3_NTFS_FS_H */

--Sig_/Utsz1.Tk.jkD.alAdewhe6k
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYgamsACgkQAVBC80lX
0Gzx2Qf8C4Jmw817QWVZz8uURMfvJzkzhjwhiIeIM6zdlm/iQ+aYcN/DMRRT+tgj
RN7OA6992oAtNFD+hMqwmat9zPXjdQZ7RFcoZUhrEu73uKgj4CKvhJmheLqfItZs
2HPpCcHgwQW2O0PvDVwNqGl4NOVXurXWIev/l5jbjKrwKEs6ToJUgu0WmXEG84uJ
cgGGrTcUMkxawmqNEOjSEO0bmfDQKduGpLp8mSm8Ofjyf6gWrdBLamA8/KX5WQuV
kLJV2sfxS+6jUTiP2y7AbvHUNXlg7kwkEb/2I/35jWqJHfViEIAzY73SdQQJNFvq
/qNEYEoWOxCT7kmlENHT6iu06gVvBw==
=uXlO
-----END PGP SIGNATURE-----

--Sig_/Utsz1.Tk.jkD.alAdewhe6k--