Hi David, James,
On Mon, 18 Aug 2008 16:33:36 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the creds tree got a conflict in
> security/commoncap.c between commit
> 5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40 ("security: Fix setting of
> PF_SUPERPRIV by __capable()") from Linus' tree (which is also in the
> creds tree) and various commits from the creds tree.
>
> The latter commits are just further changes, so I tool the creds tree
> version.
The same is true for security/selinux/hooks.c and
security/smack/smack_lsm.c.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpj6o5qSVRpx.pgp
Description: PGP signature
