Received-SPF: pass (google.com: domain of linux-kernel+bounces-13955-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 2 Jan 2024 09:36:17 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, "Steven Rostedt (Google)"
 <rostedt@goodmis.org>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Message-ID: <20240102093617.0b3a0907@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/d+MIXcnLuloSv.dh+tZIWZ6";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/d+MIXcnLuloSv.dh+tZIWZ6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/tracefs/inode.c

between commit:

  7e8358edf503 ("eventfs: Fix file and directory uid and gid ownership")

from Linus' tree and commit:

  da549bdd15c2 ("dentry: switch the lists of children to hlist")

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

--=20
Cheers,
Stephen Rothwell

diff --cc fs/tracefs/inode.c
index 62524b20964e,61ca5fcf10f9..000000000000
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@@ -207,24 -206,14 +206,21 @@@ static void set_gid(struct dentry *pare
 =20
  	change_gid(this_parent, gid);
  repeat:
- 	next =3D this_parent->d_subdirs.next;
+ 	dentry =3D d_first_child(this_parent);
  resume:
- 	while (next !=3D &this_parent->d_subdirs) {
+ 	hlist_for_each_entry_from(dentry, d_sib) {
 +		struct tracefs_inode *ti;
- 		struct list_head *tmp =3D next;
- 		struct dentry *dentry =3D list_entry(tmp, struct dentry, d_child);
- 		next =3D tmp->next;
 +
  		spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
 =20
  		change_gid(dentry, gid);
 =20
 +		/* If this is the events directory, update that too */
 +		ti =3D get_tracefs(dentry->d_inode);
 +		if (ti && (ti->flags & TRACEFS_EVENT_INODE))
 +			eventfs_update_gid(dentry, gid);
 +
- 		if (!list_empty(&dentry->d_subdirs)) {
+ 		if (!hlist_empty(&dentry->d_children)) {
  			spin_unlock(&this_parent->d_lock);
  			spin_release(&dentry->d_lock.dep_map, _RET_IP_);
  			this_parent =3D dentry;

--Sig_/d+MIXcnLuloSv.dh+tZIWZ6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTPmEACgkQAVBC80lX
0Gz6egf8DAkzOrBYU+3hxpdmPeBJ8/ZNK3XUpXqfJfvTeGRepAXnwpqfc9QbKiJT
RHlwdYtu0CxBlALMxg408duhz2tp+d9cEteOIuc/9dxkm7SH2F0tiCDk/bJXOoRh
S0HKpxmMqgXA+Sk2Z2tWF+npLz0hBlO2qxXEgA6Zc6BPnB9608LggDwWl0Gk5EGk
nIpictcCV0M/D8ukC/4/FzeF0q4g8QauRiy0DDBOw5AcQoCQoFDM2JKE1k788fus
dJJG2WzWPEHxyfjeiDob7pu3PkeQP+cRS7tN0beza3RYlGfruiPZRuODRzT+QhFO
Lc4t7yBMeD0on8SkBB5YWJvUp7lJPQ==
=ht0o
-----END PGP SIGNATURE-----

--Sig_/d+MIXcnLuloSv.dh+tZIWZ6--