On Fri, 2008-10-31 at 17:06 +1100, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the creds tree got a conflict in
> security/selinux/hooks.c between commit
> 8b6a5a37f87a414ef8636e36ec75accb27bb7508 ("SELinux: check open perms in
> dentry_open not inode_permission") from the security-testing tree and
> commits 7113316bdf8c9f91df7bd68ab739d9bd0f5e8efc ("CRED: Make
> inode_has_perm() and file_has_perm() take a cred pointer") and
> a9018998dcc1e3b4401a7f6d2050ffedbd1b64da ("CRED: Inaugurate COW
> credentials") from the creds tree.
>
> Overlapping changes. I fixed it up (see below) and can carry the fix.
ACK Looks good to me, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
