Hi Andrew, On Wed, Jan 23, 2019 at 06:03:06PM +0100, Andrew Lunn wrote: > On Wed, Jan 23, 2019 at 04:56:30PM +0100, Antoine Tenart wrote: > > This cosmetic patch converts the macsec implementation license header to > > the now recommended format, SPDX. > > > > Signed-off-by: Antoine Tenart <antoine.ten...@bootlin.com> > > --- > > drivers/net/macsec.c | 6 +----- > > 1 file changed, 1 insertion(+), 5 deletions(-) > > > > diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c > > index 64a982563d59..56e354305f76 100644 > > --- a/drivers/net/macsec.c > > +++ b/drivers/net/macsec.c > > @@ -1,12 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > /* > > * drivers/net/macsec.c - MACsec device > > * > > * Copyright (c) 2015 Sabrina Dubroca <s...@queasysnail.net> > > - * > > - * 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. > > */ > > > > #include <linux/types.h> > > linux$ tail -4 drivers/net/macsec.c > MODULE_ALIAS_GENL_FAMILY("macsec"); > > MODULE_DESCRIPTION("MACsec IEEE 802.1AE"); > MODULE_LICENSE("GPL v2"); > > The license text and the MODULE_LICENSE() don't agree with each other. > It would be good to fix this as well.
That's right, I'll fix it in v2. In such cases, the license text takes precedence over the MODULE_LICENSE() definition ? Thanks! Antoine -- Antoine Ténart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com