Re: linux-next: manual merge of the landlock tree with the security tree

[Mickaël Salaün]

On Tue, Oct 20, 2026 at 02:40:57PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the landlock tree got a conflict in:
> 
>   include/linux/ns/ns_common_types.h
> 
> between commit:
> 
>   436485132d236 ("Automated merge of 'lsm/dev' into 'stable-7.4'")

I cannot find this commit, is it a new one from linux-next?

I had to create a merge commit because the LSM next branch is too old,
so I followed the previous merge resolution from linux-next, but it
looks like today's merge commit is different than the previous ones.

> 
> from the security tree and commit:
> 
>   0cbc5a0d65b05 ("Merge branch 'lsm/dev' into master")
> 
> from the landlock 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.
> 
> diff --combined include/linux/ns/ns_common_types.h
> index 47a5cfe2326a3,fddc62be3b626..0000000000000
> --- a/include/linux/ns/ns_common_types.h
> +++ b/include/linux/ns/ns_common_types.h
> @@@ -116,11 -116,11 +116,11 @@@ struct ns_common 
>   	struct dentry *stashed;
>   	const struct proc_ns_operations *ops;
>   	unsigned int inum;
>  -	struct ns_tree;
>  -	struct rcu_head ns_rcu;
>   #ifdef CONFIG_SECURITY
>   	void *ns_security;
>   #endif
>  +	struct ns_tree;
>  +	struct rcu_head ns_rcu;

The previous merge (from yesterday and before [1]) was moving the
ns_security at the end of the struct but this new merge commit moves it
before the ns_tree field.  Do you know why?

[1] b6926a7ca6e5 ("Merge branch 'next' of
https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git";)

>   };
>   
>   #define to_ns_common(__ns)                                    \