On 27/05/19 18:56, Thomas Huth wrote: > The FSF moved from the "Temple Place" to "51 Franklin Street" quite > a while ago already, so we should not refer to the old address in > the source code anymore. Anyway, instead of replacing it with the > new address, let's rather add proper SPDX identifiers here instead. > > Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx> > --- > arch/x86/kvm/irq.c | 10 +--------- > arch/x86/kvm/irq.h | 10 +--------- > arch/x86/kvm/irq_comm.c | 9 +-------- > virt/kvm/arm/arch_timer.c | 10 +--------- > virt/kvm/irqchip.c | 10 +--------- > 5 files changed, 5 insertions(+), 44 deletions(-) > > diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c > index 007bc654f928..4b7b8e44df0f 100644 > --- a/arch/x86/kvm/irq.c > +++ b/arch/x86/kvm/irq.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * irq.c: API for in kernel interrupt controller > * Copyright (c) 2007, Intel Corporation. > @@ -7,17 +8,8 @@ > * 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple > - * Place - Suite 330, Boston, MA 02111-1307 USA. > * Authors: > * Yaozu (Eddie) Dong <Eddie.dong@xxxxxxxxx> > - * > */ > > #include <linux/export.h> > diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h > index fd210cdd4983..a904c9b3b76a 100644 > --- a/arch/x86/kvm/irq.h > +++ b/arch/x86/kvm/irq.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * irq.h: in kernel interrupt controller related definitions > * Copyright (c) 2007, Intel Corporation. > @@ -6,17 +7,8 @@ > * 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple > - * Place - Suite 330, Boston, MA 02111-1307 USA. > * Authors: > * Yaozu (Eddie) Dong <Eddie.dong@xxxxxxxxx> > - * > */ > > #ifndef __IRQ_H > diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c > index 3cc3b2d130a0..ff95fd893e04 100644 > --- a/arch/x86/kvm/irq_comm.c > +++ b/arch/x86/kvm/irq_comm.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * irq_comm.c: Common API for in kernel interrupt controller > * Copyright (c) 2007, Intel Corporation. > @@ -6,14 +7,6 @@ > * 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple > - * Place - Suite 330, Boston, MA 02111-1307 USA. > * Authors: > * Yaozu (Eddie) Dong <Eddie.dong@xxxxxxxxx> > * > diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c > index 7fc272ecae16..151495d7dec7 100644 > --- a/virt/kvm/arm/arch_timer.c > +++ b/virt/kvm/arm/arch_timer.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2012 ARM Ltd. > * Author: Marc Zyngier <marc.zyngier@xxxxxxx> > @@ -5,15 +6,6 @@ > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > */ > > #include <linux/cpu.h> > diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c > index 79e59e4fa3dc..bcc3fc5d018a 100644 > --- a/virt/kvm/irqchip.c > +++ b/virt/kvm/irqchip.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * irqchip.c: Common API for in kernel interrupt controllers > * Copyright (c) 2007, Intel Corporation. > @@ -8,15 +9,6 @@ > * 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple > - * Place - Suite 330, Boston, MA 02111-1307 USA. > - * > * This file is derived from virt/kvm/irq_comm.c. > * > * Authors: > Queued, thanks. Paolo
