On Thu, Jan 11, 2018 at 10:21:09AM -0800, Eric Anholt wrote: > Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> writes: > > > Now that the SPDX tag is in all > > drivers/staging/vc04_services/bcm2835-audio/ files, that identifies the > > license in a specific and legally-defined manner. So the extra GPL text > > wording can be removed as it is no longer needed at all. > > > > This is done on a quest to remove the 700+ different ways that files in > > the kernel describe the GPL license text. And there's unneeded stuff > > like the address (sometimes incorrect) for the FSF which is never > > needed. > > > > No copyright headers or other non-license-description text was removed. > > > > diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c > > index 4ad67e64e6b9..ec468d5719b1 100644 > > --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c > > +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c > > @@ -1,17 +1,5 @@ > > // SPDX-License-Identifier: GPL-2.0 > > -/***************************************************************************** > > - * Copyright 2011 Broadcom Corporation. All rights reserved. > > - * > > - * Unless you and Broadcom execute a separate written software license > > - * agreement governing use of this software, this software is licensed to you > > - * under the terms of the GNU General Public License version 2, available at > > - * http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). > > - * > > - * Notwithstanding the above, under no circumstances may you combine this > > - * software in any way with any other Broadcom software provided under a > > - * license other than the GPL, without Broadcom's express prior written > > - * consent. > > - *****************************************************************************/ > > +/* Copyright 2011 Broadcom Corporation. All rights reserved. */ > > The "Notwithstanding..." section feels like something unusual and not > represented by the SPDX identifier. Not sure what to do about that. It is covered by the GPL license, it's just "crazy text" that means nothing really. They are just mad that people were taking their code and using it in non-gpl products :( > The 2 camera patches are: > > Reviewed-by: Eric Anholt <eric@xxxxxxxxxx> thanks for the review, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
