Re: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
From: Jie Deng Date: Thu, 23 Mar 2017 12:03:45 +0800 > The driver "dwc-xlgmac" is dual-licensed. This patch adds > declaration of dual license in file headers. > > Signed-off-by: Jie Deng Applied.
[PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
The driver "dwc-xlgmac" is dual-licensed. This patch adds declaration of dual license in file headers. Signed-off-by: Jie Deng --- drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-net.c| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac.h| 6 ++ 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c index b72196a..cb11928 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c index 39b5cb9..e9672b1 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c index 1e25a86..0dec1dc 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c index 5e8428b..6acf86c 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c index 504e80d..386bafe 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary
Re: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
On 2017/3/23 2:50, David Miller wrote: > From: Jie Deng > Date: Tue, 21 Mar 2017 11:59:04 +0800 > >> This patch adds declaration of dual license in file headers. >> >> Signed-off-by: Jie Deng > My apologies. I applied Arnd's patches. Could you please respin > these two patches against net-next so that the final result is what > you want? > > Thanks. Sure. Thanks.
Re: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
From: Jie Deng Date: Tue, 21 Mar 2017 11:59:04 +0800 > This patch adds declaration of dual license in file headers. > > Signed-off-by: Jie Deng My apologies. I applied Arnd's patches. Could you please respin these two patches against net-next so that the final result is what you want? Thanks.
[PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
This patch adds declaration of dual license in file headers. Signed-off-by: Jie Deng --- drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-net.c| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h| 6 ++ drivers/net/ethernet/synopsys/dwc-xlgmac.h| 6 ++ 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c index 726d78a..53ad707 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c index 55c796e..bfe810e 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c index 5cf3e90..e2a58ec 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c index 5e8428b..6acf86c 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c index 504e80d..386bafe 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c @@ -2,10 +2,8 @@ * * Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com) * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is dual-licensed; you may select either version 2 of + * the GNU General Public License ("GPL") or BSD license ("BSD"). * * This Synopsys DWC XLGMAC software driver and associated documentation * (hereinafter the "Software") is an unsupported proprietary work of diff --git a/drivers/net/ethernet/