On Mon, Sep 9, 2024 at 11:27 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi all, > > Today's linux-next merge of the security tree got a conflict in: > > fs/fcntl.c > > between commit: > > 1934b212615d ("file: reclaim 24 bytes from f_owner") > > from the vfs-brauner tree and commit: > > 26f204380a3c ("fs: Fix file_set_fowner LSM hook inconsistencies") > > from the security 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. > > -- > Cheers, > Stephen Rothwell Thanks Stephen, the fixup looked from from a LSM perspective. -- paul-moore.com