> From: linux-rdma-owner@xxxxxxxxxxxxxxx <linux-rdma- > owner@xxxxxxxxxxxxxxx> On Behalf Of Gal Pressman > > On 21/08/2019 0:32, Michal Kalderon wrote: > >> From: Gal Pressman <galpress@xxxxxxxxxx> > >> Sent: Tuesday, August 20, 2019 5:08 PM > >> > >> On 20/08/2019 15:18, Michal Kalderon wrote: > >>> diff --git a/drivers/infiniband/core/ib_core_uverbs.c > >> b/drivers/infiniband/core/ib_core_uverbs.c > >>> new file mode 100644 > >>> index 000000000000..cab7dc922cf0 > >>> --- /dev/null > >>> +++ b/drivers/infiniband/core/ib_core_uverbs.c > >>> @@ -0,0 +1,100 @@ > >>> +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB > >>> +/* > >>> + * Copyright (c) 2005 Mellanox Technologies. All rights reserved. > >>> + * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All > >>> +rights > >> reserved. > >>> + * Copyright 2019 Marvell. 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. > >>> + */ > >> > >> Is the full license needed in addition to the SPDX? > > The file contains code that was placed in a different file and > > copyrighted, so I copied The copyrights from the original files based on the > git history of the code lines I copied. > > Thanks, > > Michal > > I'm referring to the license text, not the copyrights. Ok, got it thanks. I verified the text is identical to Linux-OpenIB under LICENSES. Will remove the text and leave only the spdx id.
