On 5/22/2017 4:08 PM, Paul Moore wrote:
> On Sun, May 21, 2017 at 10:38 PM, Stephen Rothwell
> wrote:
>> Hi Paul,
>>
>> Today's linux-next merge of the selinux tree got a conflict in:
>>
>> include/rdma/ib_verbs.h
>>
>> between commit:
>>
>> 2fc775726491 ("IB/opa-vnic: RDMA NETDEV interface")
On Sun, May 21, 2017 at 10:38 PM, Stephen Rothwell
wrote:
> Hi Paul,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> include/rdma/ib_verbs.h
>
> between commit:
>
> 2fc775726491 ("IB/opa-vnic: RDMA NETDEV interface")
>
> from Linus' tree and commit:
>
> 89b54b4d09bd
Hi Paul,
Today's linux-next merge of the selinux tree got a conflict in:
include/rdma/ib_verbs.h
between commit:
2fc775726491 ("IB/opa-vnic: RDMA NETDEV interface")
from Linus' tree and commit:
89b54b4d09bd ("IB/core: Enforce PKey security on QPs")
from the selinux tree.
I fixed it up
Hi David,
On Thu, 25 Jul 2013 21:22:48 -0700 David Quigley
wrote:
>
> I guess my signed off got stripped somewhere. Originally I maintained those
> commits but Steve Dickson from red hat picked them up and they then made it
> into trond's tree and then into Linus'.
>
> I unfortunately don't h
I guess my signed off got stripped somewhere. Originally I maintained those
commits but Steve Dickson from red hat picked them up and they then made it
into trond's tree and then into Linus'.
I unfortunately don't have my davequigley.com identities on my iPhone but you
can add a sign off by dpq
Hi Eric,
Today's linux-next merge of the selinux tree got a conflict in
security/selinux/hooks.c between commit eb9ae686507b ("SELinux: Add new
labeling type native labels") from Linus' tree and commits 40d3d0b85fa2
("SELinux: remove crazy contortions around proc") and a64c54cf0811
("SELinux: pass
6 matches
Mail list logo
