On Mon, May 14, 2018 at 11:16 PM, Richard Guy Briggs wrote:
> On 2018-05-15 13:06, Stephen Rothwell wrote:
>> Hi Paul,
>>
>> Today's linux-next merge of the audit tree got a conflict in:
>>
>> security/selinux/selinuxfs.c
>>
>> between commit:
>>
>> 4195ed425d3c ("audit:
On Mon, May 14, 2018 at 11:16 PM, Richard Guy Briggs wrote:
> On 2018-05-15 13:06, Stephen Rothwell wrote:
>> Hi Paul,
>>
>> Today's linux-next merge of the audit tree got a conflict in:
>>
>> security/selinux/selinuxfs.c
>>
>> between commit:
>>
>> 4195ed425d3c ("audit: normalize MAC_STATUS
On 2018-05-15 13:06, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> security/selinux/selinuxfs.c
>
> between commit:
>
> 4195ed425d3c ("audit: normalize MAC_STATUS record")
>
> from the selinux tree and commits:
>
> cdfb6b341f0f
On 2018-05-15 13:06, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> security/selinux/selinuxfs.c
>
> between commit:
>
> 4195ed425d3c ("audit: normalize MAC_STATUS record")
>
> from the selinux tree and commits:
>
> cdfb6b341f0f
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
security/selinux/selinuxfs.c
between commit:
4195ed425d3c ("audit: normalize MAC_STATUS record")
from the selinux tree and commits:
cdfb6b341f0f ("audit: use inline function to get audit context")
d141136f523a
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
security/selinux/selinuxfs.c
between commit:
4195ed425d3c ("audit: normalize MAC_STATUS record")
from the selinux tree and commits:
cdfb6b341f0f ("audit: use inline function to get audit context")
d141136f523a
6 matches
Mail list logo