linux-next: build failure after merge of the lblnet tree

From: Stephen Rothwell
Date: Fri Jul 26 2013 - 00:06:35 EST

Hi Paul,

After merging the lblnet tree, today's linux-next build (x86_64
allmodconfig) failed like this:

security/selinux/hooks.c: In function 'sb_finish_set_opts':
security/selinux/hooks.c:448:19: error: 'SE_SBLABELSUPP' undeclared (first use in this function)
sbsec->flags |= SE_SBLABELSUPP;

Caused by commit 8cf9124a324f ("SELinux: Enable setting security contexts
on rootfs inodes") interacting with commit 12f348b9dcf6 ("SELinux: rename
SE_SBLABELSUPP to SBLABEL_MNT") from the selinux tree.

This is not helped by the fact that there are a lot of commits in the
lblnet tree (including 8cf9124a324f) that have been cherry-picked
(instead of being merged) into the selinux tree. :-(

I just reverted the lblnet commit above (since it has been applied twice).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature