mei: convert to SPDX license tags
Subsystems (2)
--- drivers/misc/mei/Kconfig | 1 + drivers/misc/mei/Makefile | 2 +- drivers/misc/mei/bus-fixup.c | 13 +----- drivers/misc/mei/bus.c | 14 ++----- drivers/misc/mei/client.c | 13 +----- drivers/misc/mei/client.h | 13 +----- drivers/misc/mei/debugfs.c | 14 ++----- drivers/misc/mei/dma-ring.c | 5 ++- drivers/misc/mei/hbm.c | 13 +----- drivers/misc/mei/hbm.h | 13 +----- drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- drivers/misc/mei/hdcp/mei_hdcp.h | 2 +- drivers/misc/mei/hw-me-regs.h | 70 +++----------------------------- drivers/misc/mei/hw-me.c | 13 +----- drivers/misc/mei/hw-me.h | 15 +------ drivers/misc/mei/hw-txe-regs.h | 65 +++-------------------------- drivers/misc/mei/hw-txe.c | 13 +----- drivers/misc/mei/hw-txe.h | 13 +----- drivers/misc/mei/hw.h | 13 +----- drivers/misc/mei/init.c | 13 +----- drivers/misc/mei/interrupt.c | 14 +------ drivers/misc/mei/main.c | 14 ++----- drivers/misc/mei/mei-trace.c | 14 ++----- drivers/misc/mei/mei-trace.h | 13 +----- drivers/misc/mei/mei_dev.h | 14 ++----- drivers/misc/mei/pci-me.c | 14 ++----- drivers/misc/mei/pci-txe.c | 13 +----- include/linux/mei_cl_bus.h | 6 +++ include/uapi/linux/mei.h | 70 ++------------------------------ 29 files changed, 75 insertions(+), 417 deletions(-)
drivers/misc/mei/Kconfig +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 config INTEL_MEI tristate "Intel Management Engine Interface" depends on X86 && PCI
drivers/misc/mei/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver -# Copyright (c) 2010-2014, Intel Corporation. +# Copyright (c) 2010-2019, Intel Corporation. # obj-$(CONFIG_INTEL_MEI) += mei.o mei-objs := init.o
drivers/misc/mei/bus-fixup.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2018, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/kernel.h>
drivers/misc/mei/bus.c +3 -11
@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2012-2013, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. +* Copyright(c) 2012-2019, Intel Corporation. All rights reserved. * +* Intel Management Engine Interface (Intel MEI) Linux driver */ #include <linux/module.h>
drivers/misc/mei/client.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/sched/signal.h>
drivers/misc/mei/client.h +2 -11
@@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #ifndef _MEI_CLIENT_H_
drivers/misc/mei/debugfs.c +3 -11
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2012-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2012-2013, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ +#include <linux/slab.h> #include <linux/kernel.h> #include <linux/device.h>
drivers/misc/mei/dma-ring.c +4 -1
@@ -1,7 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright(c) 2016 - 2018 Intel Corporation. All rights reserved. +* Copyright(c) 2016-2019, Intel Corporation. All rights reserved. +* +* Intel Management Engine Interface (Intel MEI) Linux driver */ +#include <linux/dma-mapping.h> #include <linux/mei.h>
drivers/misc/mei/hbm.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/export.h>
drivers/misc/mei/hbm.h +2 -11
@@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #ifndef _MEI_HBM_H_
drivers/misc/mei/hdcp/mei_hdcp.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0) +// SPDX-License-Identifier: GPL-2.0 /* * Copyright © 2019 Intel Corporation *
drivers/misc/mei/hdcp/mei_hdcp.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+) */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright © 2019 Intel Corporation *
drivers/misc/mei/hw-me-regs.h +5 -65
73 lines not on this page · raw message
drivers/misc/mei/hw-me.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/pci.h>
drivers/misc/mei/hw-me.h +2 -13
@@ -1,21 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ - -#ifndef _MEI_INTERFACE_H_#define _MEI_INTERFACE_H_
drivers/misc/mei/hw-txe-regs.h +6 -59
69 lines not on this page · raw message
drivers/misc/mei/hw-txe.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2013-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2013-2014, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/pci.h>
drivers/misc/mei/hw-txe.h +2 -11
@@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright(c) 2013-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2013-2014, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #ifndef _MEI_HW_TXE_H_
drivers/misc/mei/hw.h +2 -11
@@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* +* Copyright(c) 2003-2013, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #ifndef _MEI_HW_TYPES_H_
drivers/misc/mei/init.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/export.h>
drivers/misc/mei/interrupt.c +2 -12
@@ -1,20 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ -#include <linux/export.h> #include <linux/kthread.h> #include <linux/interrupt.h>
drivers/misc/mei/main.c +3 -11
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2018, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h>
drivers/misc/mei/mei-trace.c +3 -11
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2015-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2015, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ +#include <linux/module.h> /* sparse doesn't like tracepoint macros */
drivers/misc/mei/mei-trace.h +2 -11
@@ -1,17 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright(c) 2015-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2015, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #if !defined(_MEI_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ )
drivers/misc/mei/mei_dev.h +3 -11
@@ -1,17 +1,9 @@/* +* SPDX-License-Identifier: GPL-2.0 * -* Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2018, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. +* Copyright(c) 2003-2018, Intel Corporation. All rights reserved. * +* Intel Management Engine Interface (Intel MEI) Linux driver */ #ifndef _MEI_DEV_H_
drivers/misc/mei/pci-me.c +3 -11
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h>
drivers/misc/mei/pci-txe.c +2 -11
@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2013-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2013-2014, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* */ #include <linux/module.h>
include/linux/mei_cl_bus.h +6 -0
@@ -1,4 +1,10 @@/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright(c) 2013-2019, Intel Corporation. All rights reserved. +* +* Intel Management Engine Interface (Intel MEI) Linux driver +*/ +#ifndef _LINUX_MEI_CL_BUS_H#define _LINUX_MEI_CL_BUS_H
include/uapi/linux/mei.h +4 -66
73 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerQuoted 1 line · Tomas Winkler
Signed-off-by Tomas Winkler <[email protected]>
I can not take patches without any changelog text.
Especially a patch that does not actually do what your subject: line says it does.
drivers/misc/mei/Makefile line 7
Quoted 11 lines
drivers/misc/mei/Makefile +1
-1@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver -# Copyright (c) 2010-2014, Intel Corporation. +# Copyright (c) 2010-2019, Intel Corporation. # obj-$(CONFIG_INTEL_MEI) += mei.o mei-objs := init.o
As an example, why did you update this copyright line? That has nothing to do with the SPDX identifier :(
drivers/misc/mei/client.c line 4
Quoted 9 lines
drivers/misc/mei/client.c +2
-1@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation.
Are you _SURE_ you mean to change the dates of the copyright in this manner for this file (and elsewhere?) Was the copyright really updated every year for the past 7 years?
Please break this up into two (at the least) patches and resend as a series.
This patch makes me feel like it is a kernel intern application process patch, and that's not good, you all know better than this. No, sorry, I take that back, the intern application patches are of much higher quality...
greg k-h
Quoted 4 lines · Tomas Winkler
Quoted 1 line
Signed-off-by Tomas Winkler <[email protected]>I can not take patches without any changelog text.
Ok, my mistake.
Quoted 2 lines
Especially a patch that does not actually do what your subject: line says it does.
Yep, I should be more verbose.
Quoted 15 lines
Quoted 7 lines
drivers/misc/mei/Makefile +0
-0@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile - Intel Management Engine Interface (Intel MEI) LinuxQuoted 5 lines
driver -# Copyright (c) 2010-2014, Intel Corporation. +# Copyright (c) 2010-2019, Intel Corporation.
#
obj-$(CONFIG_INTEL_MEI) += mei.o
mei-objs := init.oAs an example, why did you update this copyright line? That has nothing to do with the SPDX identifier :(
Right, will update the commit message.
Quoted 15 lines
drivers/misc/mei/client.c line 4
Quoted 11 lines
drivers/misc/mei/client.c +2
-1@@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* +* Copyright(c) 2003-2019, Intel Corporation. All rights reserved. * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. Are you _SURE_ you mean to change the dates of the copyright in this manner for this file (and elsewhere?) Was the copyright really updated every year for the past 7 years?
Yes, this particular file was updated, will go over other files.
Quoted 2 lines
Please break this up into two (at the least) patches and resend as a series.
Can you be please, more specific what split are you expecting.
Quoted 5 lines
This patch makes me feel like it is a kernel intern application process patch, and that's not good, you all know better than this. No, sorry, I take that back, the intern application patches are of much higher quality...
Have hard time to put the soul into it, where it comes to legal :) Will fix.
Tomas
Greg Kroah-Hartman
maintainerQuoted 3 lines · Tomas
Quoted 1 line
Please break this up into two (at the least) patches and resend as a series.
Can you be please, more specific what split are you expecting.
You are doing lots of different types of things in the same patch. Break up the logical changes into different patches. For example, one patch that updates copyright years, one that removes boiler plate license crud, and another that adds missing spdx lines.
greg k-h
Quoted 11 lines · Tomas
Quoted 3 lines
Quoted 1 line
Please break this up into two (at the least) patches and resend as a series.
Can you be please, more specific what split are you expecting.
You are doing lots of different types of things in the same patch. Break up the logical changes into different patches. For example, one patch that updates copyright years, one that removes boiler plate license crud, and another that adds missing spdx lines.
Okay
Thanks
Tomas