On Thu, Apr 07, 2016 at 02:33:57AM +0300, Dan Jurgens wrote: > From: Daniel Jurgens <danielj@xxxxxxxxxxxx> > > --- a/drivers/infiniband/core/core_security.c > +++ b/drivers/infiniband/core/core_security.c > @@ -1,4 +1,5 @@ > -/* > +/* NEW COMMIT TO INSERT INTO REBASE ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Irrelevant > + * > * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved. > * > * This software is available to you under a choice of one of two > @@ -33,11 +34,27 @@ > #ifdef CONFIG_SECURITY_INFINIBAND >
Attachment:
signature.asc
Description: Digital signature
