Re: linux-next: manual merge of the selinux tree with the security tree

On Tue, Apr 3, 2018 at 12:43 AM, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the selinux tree got a conflict in: > > include/linux/lsm_hooks.h > > between commit: > > 22402b0b736d ("security: convert security hooks to use hlist") > > from the security tree and commit: >

linux-next: manual merge of the selinux tree with the security tree

Hi Paul, Today's linux-next merge of the selinux tree got a conflict in: include/linux/lsm_hooks.h between commit: 22402b0b736d ("security: convert security hooks to use hlist") from the security tree and commit: 72e89f50084c ("security: Add support for SCTP security hooks") from the s

Re: linux-next: manual merge of the selinux tree with the security tree

On Tue, Mar 20, 2018 at 11:31 PM, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the selinux tree got a conflict in: > > security/selinux/hooks.c > > between commit: > > 6b4f3d01052a ("usb, signal, security: only pass the cred, not the secid, to > kill_pid_info_as_cred an

linux-next: manual merge of the selinux tree with the security tree

Hi Paul, Today's linux-next merge of the selinux tree got a conflict in: security/selinux/hooks.c between commit: 6b4f3d01052a ("usb, signal, security: only pass the cred, not the secid, to kill_pid_info_as_cred and security_task_kill") from the security tree and commit: 6b6bc6205d98 (