linux-next: manual merge of the selinux tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  security/selinux/hooks.c

between commit:

  a20456aef80f ("selinux: fix typo in filesystem name")

from Linus' tree and commit:

  4ca54d3d3022 ("security: selinux: allow per-file labeling for bpffs")

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

diff --cc security/selinux/hooks.c
index ae891d712800,44f6f4e20cba..000000000000
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -698,7 -701,8 +701,8 @@@ static int selinux_set_mnt_opts(struct 
  
  	if (!strcmp(sb->s_type->name, "debugfs") ||
  	    !strcmp(sb->s_type->name, "tracefs") ||
 -	    !strcmp(sb->s_type->name, "binderfs") ||
 +	    !strcmp(sb->s_type->name, "binder") ||
+ 	    !strcmp(sb->s_type->name, "bpf") ||
  	    !strcmp(sb->s_type->name, "pstore"))
  		sbsec->flags |= SE_SBGENFS;

Attachment: pgpRLCkCCA32X.pgp
Description: OpenPGP digital signature