Re: linux-next: manual merge of the security tree with the vfs-brauner-fixes tree

[Paul Moore]

On Tue, Sep 1, 2026 at 9:51 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the security tree got a conflict in:
>
>   include/linux/ns/ns_common_types.h
>
> between commit:
>
>   82e9343260dfc ("nsfs: keep namespace tree fields stable until after RCU grace period")
>
> from the vfs-brauner-fixes tree and commit:
>
>   f675d2e955696 ("lsm: add LSM blob and hooks for namespaces")
>
> 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.
>
> diff --cc include/linux/ns/ns_common_types.h
> index 6ed6b497831c7,5cfe0ce3c8818..0000000000000
> --- a/include/linux/ns/ns_common_types.h
> +++ b/include/linux/ns/ns_common_types.h
> @@@ -116,8 -116,13 +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
>  -      union {
>  -              struct ns_tree;
>  -              struct rcu_head ns_rcu;
>  -      };
>   };
                                \
Looks reasonable, thanks Mark.

-- 
paul-moore.com