diff for duplicates of <004d01d09897$a06f8090$e14e81b0$@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 03fef8a..14942cc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,23 +1,14 @@ -My bad. This is ISC license. MODULE_LICENSE should actually be "Dual = -BSD/GPL". -Same license is used in other places in the kernel like = -drivers/net/wireless/ath/ath10k/pci.c. +My bad. This is ISC license. MODULE_LICENSE should actually be "Dual BSD/GPL". +Same license is used in other places in the kernel like drivers/net/wireless/ath/ath10k/pci.c. I'll post a v2. Thanks, Mathieu -----Original Message----- -From: Paul Bolle [mailto:pebolle@tiscali.nl]=20 +From: Paul Bolle [mailto:pebolle@tiscali.nl] Sent: Wednesday, May 27, 2015 12:04 AM To: Mathieu Olivari -Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; = -ijc+devicetree@hellion.org.uk; galak@codeaurora.org; = -mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; = -agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; = -georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; = -davem@davemloft.net; vbridger@opensource.altera.com; = -devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; = -linux-clk@vger.kernel.org; netdev@vger.kernel.org +Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; davem@davemloft.net; vbridger@opensource.altera.com; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-clk@vger.kernel.org; netdev@vger.kernel.org Subject: Re: [PATCH 4/5] stmmac: add ipq806x glue layer Just a nit: a license mismatch. @@ -26,23 +17,22 @@ On Tue, 2015-05-26 at 12:27 -0700, Mathieu Olivari wrote: > --- /dev/null > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -> + * Permission to use, copy, modify, and/or distribute this software=20 +> + * Permission to use, copy, modify, and/or distribute this software > + for any -> + * purpose with or without fee is hereby granted, provided that the=20 +> + * purpose with or without fee is hereby granted, provided that the > + above > + * copyright notice and this permission notice appear in all copies. > + * -> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL=20 +> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL > + WARRANTIES > + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE=20 +> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE > + LIABLE FOR -> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY=20 +> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY > + DAMAGES -> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN = - +> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN > + AN -> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING=20 +> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING > + OUT OF > + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -50,8 +40,7 @@ I have no idea which license this is. > +MODULE_LICENSE("GPL"); -But I do know that it's not GPL v2 or later (see = -include/linux/module.h). +But I do know that it's not GPL v2 or later (see include/linux/module.h). Paul Bolle diff --git a/a/content_digest b/N1/content_digest index abf9621..3321eaa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,48 +5,39 @@ "Subject\0RE: [PATCH 4/5] stmmac: add ipq806x glue layer\0" "Date\0Wed, 27 May 2015 09:10:16 -0700\0" "To\0'Paul Bolle' <pebolle@tiscali.nl>\0" - "Cc\0<robh+dt@kernel.org>" - <pawel.moll@arm.com> - <mark.rutland@arm.com> - <ijc+devicetree@hellion.org.uk> - <galak@codeaurora.org> - <mturquette@linaro.org> - <sboyd@codeaurora.org> - <peppe.cavallaro@st.com> - <agross@codeaurora.org> - <joshc@codeaurora.org> - <architt@codeaurora.org> - <georgi.djakov@linaro.org> - <wsa@the-dreams.de> - <rnayak@codeaurora.org> - <davem@davemloft.net> - <vbridger@opensource.altera.com> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-clk@vger.kernel.org> - " <netdev@vger.kernel.org>\0" + "Cc\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + mturquette@linaro.org + sboyd@codeaurora.org + peppe.cavallaro@st.com + agross@codeaurora.org + joshc@codeaurora.org + architt@codeaurora.org + georgi.djakov@linaro.org + wsa@the-dreams.de + rnayak@codeaurora.org + davem@davemloft.net + vbridger@opensource.altera.com + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-clk@vger.kernel.org + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" - "My bad. This is ISC license. MODULE_LICENSE should actually be \"Dual =\n" - "BSD/GPL\".\n" - "Same license is used in other places in the kernel like =\n" - "drivers/net/wireless/ath/ath10k/pci.c.\n" + "My bad. This is ISC license. MODULE_LICENSE should actually be \"Dual BSD/GPL\".\n" + "Same license is used in other places in the kernel like drivers/net/wireless/ath/ath10k/pci.c.\n" "I'll post a v2.\n" "Thanks,\n" "Mathieu\n" "\n" "-----Original Message-----\n" - "From: Paul Bolle [mailto:pebolle@tiscali.nl]=20\n" + "From: Paul Bolle [mailto:pebolle@tiscali.nl] \n" "Sent: Wednesday, May 27, 2015 12:04 AM\n" "To: Mathieu Olivari\n" - "Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; =\n" - "ijc+devicetree@hellion.org.uk; galak@codeaurora.org; =\n" - "mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; =\n" - "agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; =\n" - "georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; =\n" - "davem@davemloft.net; vbridger@opensource.altera.com; =\n" - "devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; =\n" - "linux-clk@vger.kernel.org; netdev@vger.kernel.org\n" + "Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; davem@davemloft.net; vbridger@opensource.altera.com; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-clk@vger.kernel.org; netdev@vger.kernel.org\n" "Subject: Re: [PATCH 4/5] stmmac: add ipq806x glue layer\n" "\n" "Just a nit: a license mismatch.\n" @@ -55,23 +46,22 @@ "> --- /dev/null\n" "> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c\n" "\n" - "> + * Permission to use, copy, modify, and/or distribute this software=20\n" + "> + * Permission to use, copy, modify, and/or distribute this software \n" "> + for any\n" - "> + * purpose with or without fee is hereby granted, provided that the=20\n" + "> + * purpose with or without fee is hereby granted, provided that the \n" "> + above\n" "> + * copyright notice and this permission notice appear in all copies.\n" "> + *\n" - "> + * THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL=20\n" + "> + * THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL \n" "> + WARRANTIES\n" "> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\n" - "> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE=20\n" + "> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE \n" "> + LIABLE FOR\n" - "> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY=20\n" + "> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY \n" "> + DAMAGES\n" - "> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN =\n" - "\n" + "> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN \n" "> + AN\n" - "> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING=20\n" + "> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING \n" "> + OUT OF\n" "> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" "\n" @@ -79,10 +69,9 @@ "\n" "> +MODULE_LICENSE(\"GPL\");\n" "\n" - "But I do know that it's not GPL v2 or later (see =\n" - "include/linux/module.h).\n" + "But I do know that it's not GPL v2 or later (see include/linux/module.h).\n" "\n" "\n" Paul Bolle -1e8c3f4bba3e565b71c3a4042efb19a161e979ae4e352ee4e472d5e58182af1d +cc384e3152cda0f0b4bdb7d2a4b93d62d501d59f0533415e00e96ac3585d8746
diff --git a/a/1.txt b/N2/1.txt index 03fef8a..14942cc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,23 +1,14 @@ -My bad. This is ISC license. MODULE_LICENSE should actually be "Dual = -BSD/GPL". -Same license is used in other places in the kernel like = -drivers/net/wireless/ath/ath10k/pci.c. +My bad. This is ISC license. MODULE_LICENSE should actually be "Dual BSD/GPL". +Same license is used in other places in the kernel like drivers/net/wireless/ath/ath10k/pci.c. I'll post a v2. Thanks, Mathieu -----Original Message----- -From: Paul Bolle [mailto:pebolle@tiscali.nl]=20 +From: Paul Bolle [mailto:pebolle@tiscali.nl] Sent: Wednesday, May 27, 2015 12:04 AM To: Mathieu Olivari -Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; = -ijc+devicetree@hellion.org.uk; galak@codeaurora.org; = -mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; = -agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; = -georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; = -davem@davemloft.net; vbridger@opensource.altera.com; = -devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; = -linux-clk@vger.kernel.org; netdev@vger.kernel.org +Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; davem@davemloft.net; vbridger@opensource.altera.com; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-clk@vger.kernel.org; netdev@vger.kernel.org Subject: Re: [PATCH 4/5] stmmac: add ipq806x glue layer Just a nit: a license mismatch. @@ -26,23 +17,22 @@ On Tue, 2015-05-26 at 12:27 -0700, Mathieu Olivari wrote: > --- /dev/null > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -> + * Permission to use, copy, modify, and/or distribute this software=20 +> + * Permission to use, copy, modify, and/or distribute this software > + for any -> + * purpose with or without fee is hereby granted, provided that the=20 +> + * purpose with or without fee is hereby granted, provided that the > + above > + * copyright notice and this permission notice appear in all copies. > + * -> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL=20 +> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL > + WARRANTIES > + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE=20 +> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE > + LIABLE FOR -> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY=20 +> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY > + DAMAGES -> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN = - +> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN > + AN -> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING=20 +> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING > + OUT OF > + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -50,8 +40,7 @@ I have no idea which license this is. > +MODULE_LICENSE("GPL"); -But I do know that it's not GPL v2 or later (see = -include/linux/module.h). +But I do know that it's not GPL v2 or later (see include/linux/module.h). Paul Bolle diff --git a/a/content_digest b/N2/content_digest index abf9621..1dfa3ed 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -27,26 +27,17 @@ " <netdev@vger.kernel.org>\0" "\00:1\0" "b\0" - "My bad. This is ISC license. MODULE_LICENSE should actually be \"Dual =\n" - "BSD/GPL\".\n" - "Same license is used in other places in the kernel like =\n" - "drivers/net/wireless/ath/ath10k/pci.c.\n" + "My bad. This is ISC license. MODULE_LICENSE should actually be \"Dual BSD/GPL\".\n" + "Same license is used in other places in the kernel like drivers/net/wireless/ath/ath10k/pci.c.\n" "I'll post a v2.\n" "Thanks,\n" "Mathieu\n" "\n" "-----Original Message-----\n" - "From: Paul Bolle [mailto:pebolle@tiscali.nl]=20\n" + "From: Paul Bolle [mailto:pebolle@tiscali.nl] \n" "Sent: Wednesday, May 27, 2015 12:04 AM\n" "To: Mathieu Olivari\n" - "Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; =\n" - "ijc+devicetree@hellion.org.uk; galak@codeaurora.org; =\n" - "mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; =\n" - "agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; =\n" - "georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; =\n" - "davem@davemloft.net; vbridger@opensource.altera.com; =\n" - "devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; =\n" - "linux-clk@vger.kernel.org; netdev@vger.kernel.org\n" + "Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; mturquette@linaro.org; sboyd@codeaurora.org; peppe.cavallaro@st.com; agross@codeaurora.org; joshc@codeaurora.org; architt@codeaurora.org; georgi.djakov@linaro.org; wsa@the-dreams.de; rnayak@codeaurora.org; davem@davemloft.net; vbridger@opensource.altera.com; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-clk@vger.kernel.org; netdev@vger.kernel.org\n" "Subject: Re: [PATCH 4/5] stmmac: add ipq806x glue layer\n" "\n" "Just a nit: a license mismatch.\n" @@ -55,23 +46,22 @@ "> --- /dev/null\n" "> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c\n" "\n" - "> + * Permission to use, copy, modify, and/or distribute this software=20\n" + "> + * Permission to use, copy, modify, and/or distribute this software \n" "> + for any\n" - "> + * purpose with or without fee is hereby granted, provided that the=20\n" + "> + * purpose with or without fee is hereby granted, provided that the \n" "> + above\n" "> + * copyright notice and this permission notice appear in all copies.\n" "> + *\n" - "> + * THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL=20\n" + "> + * THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL \n" "> + WARRANTIES\n" "> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\n" - "> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE=20\n" + "> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE \n" "> + LIABLE FOR\n" - "> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY=20\n" + "> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY \n" "> + DAMAGES\n" - "> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN =\n" - "\n" + "> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN \n" "> + AN\n" - "> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING=20\n" + "> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING \n" "> + OUT OF\n" "> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" "\n" @@ -79,10 +69,9 @@ "\n" "> +MODULE_LICENSE(\"GPL\");\n" "\n" - "But I do know that it's not GPL v2 or later (see =\n" - "include/linux/module.h).\n" + "But I do know that it's not GPL v2 or later (see include/linux/module.h).\n" "\n" "\n" Paul Bolle -1e8c3f4bba3e565b71c3a4042efb19a161e979ae4e352ee4e472d5e58182af1d +64be9580c1c7e1df29f6bfba98ff127b07be9055a9431e4a35e1f01fd7c3b5bb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.