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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Paul Moore]

On Friday, July 26, 2013 02:06:17 PM Stephen Rothwell wrote:
> 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.  :-(

The problem should be fixed now.

The issue was that I was temporarily holding a lot of these SELinux patches in 
the lblnet-next tree so they could get some linux-next exposure while Eric was 
busy an unable to update the SELinux tree.  Unfortunately, there was some 
miscommunication between Eric and I yesterday and the trees got a bit out of 
sync.  All the lblnet-next patches have now been included in the SELinux tree 
so I've "pruned" them from the lblnet-next tree.

Thanks for your understanding,
-Paul

-- 
paul moore
www.paul-moore.com