On Wed, 2018-03-07 at 12:59 -0600, Steve Wise wrote: > > On Thu, 2018-03-01 at 13:57 -0800, Steve Wise wrote: > > > diff --git a/drivers/infiniband/core/cma_priv.h > > > > b/drivers/infiniband/core/cma_priv.h > > > new file mode 100644 > > > index 0000000..11a41be > > > --- /dev/null > > > +++ b/drivers/infiniband/core/cma_priv.h > > > @@ -0,0 +1,79 @@ > > > +/* > > > + * Copyright (c) 2005 Voltaire Inc. All rights reserved. > > > + * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved. > > > + * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved. > > > + * Copyright (c) 2005-2006 Intel Corporation. All rights reserved. > > > + * > > > + * This software is available to you under a choice of one of two > > > + * licenses. You may choose to be licensed under the terms of the GNU > > > + * General Public License (GPL) Version 2, available from the file > > > + * COPYING in the main directory of this source tree, or the > > > + * OpenIB.org BSD license below: > > > + * > > > + * Redistribution and use in source and binary forms, with or > > > + * without modification, are permitted provided that the following > > > + * conditions are met: > > > + * > > > + * - Redistributions of source code must retain the above > > > + * copyright notice, this list of conditions and the following > > > + * disclaimer. > > > + * > > > + * - Redistributions in binary form must reproduce the above > > > + * copyright notice, this list of conditions and the following > > > + * disclaimer in the documentation and/or other materials > > > + * provided with the distribution. > > > + * > > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY > > > > KIND, > > > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE > > > > WARRANTIES OF > > > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > > > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > > > > HOLDERS > > > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER > > > > IN AN > > > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF > > > > OR IN > > > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > > > > IN THE > > > + * SOFTWARE. > > > + */ > > > > Why the big copyright instead of the new copyright headers? > > I modeled it after core_priv.h It just makes another file we have to audit and change later. Anyway, I'll accept it as is, but I think we need to start using the kernel license indicators instead. -- Doug Ledford <dledford@xxxxxxxxxx> GPG KeyID: B826A3330E572FDD Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: This is a digitally signed message part