diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 12:58:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 12:58:42 -0400 |
commit | c884d8ac7ffccc094e9674a3eb3be90d3b296c0a (patch) | |
tree | b606720bcb75a80ca1cea53ee831a6849c21bf28 /drivers/net/usb | |
parent | 05512b0f46526c4e248b1da9386d73a84b7d327b (diff) | |
parent | c891f3b97964a07c5797569126c90a3865a6ba18 (diff) |
Merge tag 'spdx-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull still more SPDX updates from Greg KH:
"Another round of SPDX updates for 5.2-rc6
Here is what I am guessing is going to be the last "big" SPDX update
for 5.2. It contains all of the remaining GPLv2 and GPLv2+ updates
that were "easy" to determine by pattern matching. The ones after this
are going to be a bit more difficult and the people on the spdx list
will be discussing them on a case-by-case basis now.
Another 5000+ files are fixed up, so our overall totals are:
Files checked: 64545
Files with SPDX: 45529
Compared to the 5.1 kernel which was:
Files checked: 63848
Files with SPDX: 22576
This is a huge improvement.
Also, we deleted another 20000 lines of boilerplate license crud,
always nice to see in a diffstat"
* tag 'spdx-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: (65 commits)
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 507
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 506
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 505
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 504
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 503
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 502
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 501
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 498
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 496
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 495
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 491
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 490
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 489
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 488
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 487
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 486
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 485
...
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/cdc_mbim.c | 5 | ||||
-rw-r--r-- | drivers/net/usb/huawei_cdc_ncm.c | 6 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.c | 5 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.h | 5 | ||||
-rw-r--r-- | drivers/net/usb/qmi_wwan.c | 5 | ||||
-rw-r--r-- | drivers/net/usb/r8152.c | 6 | ||||
-rw-r--r-- | drivers/net/usb/rtl8150.c | 5 | ||||
-rw-r--r-- | drivers/net/usb/sr9700.h | 5 |
8 files changed, 8 insertions, 34 deletions
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 28321aca48fe..eb100eb33de3 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c | |||
@@ -1,13 +1,10 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2012 Smith Micro Software, Inc. | 3 | * Copyright (c) 2012 Smith Micro Software, Inc. |
3 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> | 4 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> |
4 | * | 5 | * |
5 | * This driver is based on and reuse most of cdc_ncm, which is | 6 | * This driver is based on and reuse most of cdc_ncm, which is |
6 | * Copyright (C) ST-Ericsson 2010-2012 | 7 | * Copyright (C) ST-Ericsson 2010-2012 |
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License | ||
10 | * version 2 as published by the Free Software Foundation. | ||
11 | */ | 8 | */ |
12 | 9 | ||
13 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c index 63f28908afda..e15a472c6a54 100644 --- a/drivers/net/usb/huawei_cdc_ncm.c +++ b/drivers/net/usb/huawei_cdc_ncm.c | |||
@@ -1,8 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* huawei_cdc_ncm.c - handles Huawei devices using the CDC NCM protocol as | 2 | /* huawei_cdc_ncm.c - handles Huawei devices using the CDC NCM protocol as |
2 | * transport layer. | 3 | * transport layer. |
3 | * Copyright (C) 2013 Enrico Mioso <mrkiko.rs@gmail.com> | 4 | * Copyright (C) 2013 Enrico Mioso <mrkiko.rs@gmail.com> |
4 | * | 5 | * |
5 | * | ||
6 | * ABSTRACT: | 6 | * ABSTRACT: |
7 | * This driver handles devices resembling the CDC NCM standard, but | 7 | * This driver handles devices resembling the CDC NCM standard, but |
8 | * encapsulating another protocol inside it. An example are some Huawei 3G | 8 | * encapsulating another protocol inside it. An example are some Huawei 3G |
@@ -11,10 +11,6 @@ | |||
11 | * This code has been heavily inspired by the cdc_mbim.c driver, which is | 11 | * This code has been heavily inspired by the cdc_mbim.c driver, which is |
12 | * Copyright (c) 2012 Smith Micro Software, Inc. | 12 | * Copyright (c) 2012 Smith Micro Software, Inc. |
13 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> | 13 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> |
14 | * | ||
15 | * This program is free software; you can redistribute it and/or | ||
16 | * modify it under the terms of the GNU General Public License | ||
17 | * version 2 as published by the Free Software Foundation. | ||
18 | */ | 14 | */ |
19 | 15 | ||
20 | #include <linux/module.h> | 16 | #include <linux/module.h> |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 63e44e746ccc..6d25dea5ad4b 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -1,10 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com) | 3 | * Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com) |
3 | * | 4 | * |
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * ChangeLog: | 5 | * ChangeLog: |
9 | * .... Most of the time spent on reading sources & docs. | 6 | * .... Most of the time spent on reading sources & docs. |
10 | * v0.2.x First official release for the Linux kernel. | 7 | * v0.2.x First official release for the Linux kernel. |
diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h index 9b7ea9c9167d..a05b143155ba 100644 --- a/drivers/net/usb/pegasus.h +++ b/drivers/net/usb/pegasus.h | |||
@@ -1,9 +1,6 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com) | 3 | * Copyright (c) 1999-2013 Petko Manolov (petkan@nucleusys.com) |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as published | ||
6 | * by the Free Software Foundation. | ||
7 | */ | 4 | */ |
8 | 5 | ||
9 | 6 | ||
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 780c10ee359b..d080f8048e52 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c | |||
@@ -1,13 +1,10 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> | 3 | * Copyright (c) 2012 Bjørn Mork <bjorn@mork.no> |
3 | * | 4 | * |
4 | * The probing code is heavily inspired by cdc_ether, which is: | 5 | * The probing code is heavily inspired by cdc_ether, which is: |
5 | * Copyright (C) 2003-2005 by David Brownell | 6 | * Copyright (C) 2003-2005 by David Brownell |
6 | * Copyright (C) 2006 by Ole Andre Vadla Ravnas (ActiveSync) | 7 | * Copyright (C) 2006 by Ole Andre Vadla Ravnas (ActiveSync) |
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License | ||
10 | * version 2 as published by the Free Software Foundation. | ||
11 | */ | 8 | */ |
12 | 9 | ||
13 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index b01bfa63860d..e0dcb681cfe5 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
@@ -1,10 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved. | 3 | * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved. |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * version 2 as published by the Free Software Foundation. | ||
7 | * | ||
8 | */ | 4 | */ |
9 | 5 | ||
10 | #include <linux/signal.h> | 6 | #include <linux/signal.h> |
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 59dbdbb5feff..98f33e270af1 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
@@ -1,9 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2002 Petko Manolov (petkan@users.sourceforge.net) | 3 | * Copyright (c) 2002 Petko Manolov (petkan@users.sourceforge.net) |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * version 2 as published by the Free Software Foundation. | ||
7 | */ | 4 | */ |
8 | 5 | ||
9 | #include <linux/signal.h> | 6 | #include <linux/signal.h> |
diff --git a/drivers/net/usb/sr9700.h b/drivers/net/usb/sr9700.h index 258b030277e7..ea2b4de621c8 100644 --- a/drivers/net/usb/sr9700.h +++ b/drivers/net/usb/sr9700.h | |||
@@ -1,11 +1,8 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices | 3 | * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices |
3 | * | 4 | * |
4 | * Author : Liu Junliang <liujunliang_ljl@163.com> | 5 | * Author : Liu Junliang <liujunliang_ljl@163.com> |
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * version 2 as published by the Free Software Foundation. | ||
9 | */ | 6 | */ |
10 | 7 | ||
11 | #ifndef _SR9700_H | 8 | #ifndef _SR9700_H |