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

2017-05-22 Thread Daniel Jurgens
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")

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

2017-05-22 Thread Paul Moore
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

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

2013-07-26 Thread Stephen Rothwell
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

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

2013-07-25 Thread David Quigley
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