* [PATCH 1/5] block: switch all files cleared marked as GPLv2 to SPDX tags
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
@ 2019-04-30 18:42 ` Christoph Hellwig
2019-04-30 21:38 ` Chaitanya Kulkarni
2019-04-30 18:42 ` [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later " Christoph Hellwig
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2019-04-30 18:42 UTC (permalink / raw)
To: Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
All these files have some form of the usual GPLv2 boilerplate. Switch
them to use SPDX tags instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/badblocks.c | 10 +---------
block/bio-integrity.c | 16 +---------------
block/bio.c | 15 +--------------
block/blk-flush.c | 3 +--
block/blk-integrity.c | 16 +---------------
block/blk-mq-debugfs.c | 13 +------------
block/blk-mq-pci.c | 10 +---------
block/blk-mq-rdma.c | 10 +---------
block/blk-mq-virtio.c | 10 +---------
block/bsg.c | 9 +--------
block/kyber-iosched.c | 13 +------------
block/opal_proto.h | 10 +---------
block/partitions/acorn.c | 7 +------
block/scsi_ioctl.c | 16 +---------------
block/sed-opal.c | 10 +---------
block/t10-pi.c | 19 +------------------
include/linux/bio.h | 15 +--------------
include/linux/bvec.h | 15 +--------------
include/linux/sed-opal.h | 10 +---------
19 files changed, 19 insertions(+), 208 deletions(-)
diff --git a/block/badblocks.c b/block/badblocks.c
index 91f7bcf979d3..2e5f5697db35 100644
--- a/block/badblocks.c
+++ b/block/badblocks.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Bad block management
*
* - Heavily based on MD badblocks code from Neil Brown
*
* 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/badblocks.h>
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 1b633a3526d4..42536674020a 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -1,23 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* bio-integrity.c - bio data integrity extensions
*
* Copyright (C) 2007, 2008, 2009 Oracle Corporation
* Written by: Martin K. Petersen <martin.petersen@oracle.com>
- *
- * 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; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
- * USA.
- *
*/
#include <linux/blkdev.h>
diff --git a/block/bio.c b/block/bio.c
index 029afb121a48..683cbb40f051 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2001 Jens Axboe <axboe@kernel.dk>
- *
- * 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 Licens
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
- *
*/
#include <linux/mm.h>
#include <linux/swap.h>
diff --git a/block/blk-flush.c b/block/blk-flush.c
index d95f94892015..aedd9320e605 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Functions to sequence PREFLUSH and FUA writes.
*
* Copyright (C) 2011 Max Planck Institute for Gravitational Physics
* Copyright (C) 2011 Tejun Heo <tj@kernel.org>
*
- * This file is released under the GPLv2.
- *
* REQ_{PREFLUSH|FUA} requests are decomposed to sequences consisted of three
* optional steps - PREFLUSH, DATA and POSTFLUSH - according to the request
* properties and hardware capability.
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index d1ab089e0919..7f302f7b9d84 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -1,23 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* blk-integrity.c - Block layer data integrity extensions
*
* Copyright (C) 2007, 2008 Oracle Corporation
* Written by: Martin K. Petersen <martin.petersen@oracle.com>
- *
- * 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; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
- * USA.
- *
*/
#include <linux/blkdev.h>
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index ec1d18cb643c..6aea0ebc3a73 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 Facebook
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License v2 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, see <https://www.gnu.org/licenses/>.
*/
#include <linux/kernel.h>
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index 1dce18553984..ad4545a2a98b 100644
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2016 Christoph Hellwig.
- *
- * 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/kobject.h>
#include <linux/blkdev.h>
diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c
index 45030a81a1ed..cc921e6ba709 100644
--- a/block/blk-mq-rdma.c
+++ b/block/blk-mq-rdma.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2017 Sagi Grimberg.
- *
- * 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/blk-mq.h>
#include <linux/blk-mq-rdma.h>
diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index 370827163835..75a52c18a8f6 100644
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2016 Christoph Hellwig.
- *
- * 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/device.h>
#include <linux/blk-mq.h>
diff --git a/block/bsg.c b/block/bsg.c
index f306853c6b08..833c44b3d458 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1,13 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* bsg.c - block layer implementation of the sg v4 interface
- *
- * Copyright (C) 2004 Jens Axboe <axboe@suse.de> SUSE Labs
- * Copyright (C) 2004 Peter M. Jones <pjones@redhat.com>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
*/
#include <linux/module.h>
#include <linux/init.h>
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index ec6a04e01bc1..c3b05119cebd 100644
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* The Kyber I/O scheduler. Controls latency by throttling queue depths using
* scalable techniques.
*
* Copyright (C) 2017 Facebook
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License v2 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, see <https://www.gnu.org/licenses/>.
*/
#include <linux/kernel.h>
diff --git a/block/opal_proto.h b/block/opal_proto.h
index b6e352cfe982..d9a05ad02eb5 100644
--- a/block/opal_proto.h
+++ b/block/opal_proto.h
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright © 2016 Intel Corporation
*
* Authors:
* Rafael Antognolli <rafael.antognolli@intel.com>
* Scott Bauer <scott.bauer@intel.com>
- *
- * 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/types.h>
diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c
index fbeb697374d5..7587700fad4a 100644
--- a/block/partitions/acorn.c
+++ b/block/partitions/acorn.c
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
/*
- * linux/fs/partitions/acorn.c
- *
* Copyright (c) 1996-2000 Russell King.
*
- * 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.
- *
* Scan ADFS partitions on hard disk drives. Unfortunately, there
* isn't a standard for partitioning drives on Acorn machines, so
* every single manufacturer of SCSI and IDE cards created their own
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 533f4aee8567..f5e0ad65e86a 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2001 Jens Axboe <axboe@suse.de>
- *
- * 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 Licens
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
- *
*/
#include <linux/kernel.h>
#include <linux/errno.h>
diff --git a/block/sed-opal.c b/block/sed-opal.c
index b1aa0cc25803..a46e8d13e16d 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright © 2016 Intel Corporation
*
* Authors:
* Scott Bauer <scott.bauer@intel.com>
* Rafael Antognolli <rafael.antognolli@intel.com>
- *
- * 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.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ":OPAL: " fmt
diff --git a/block/t10-pi.c b/block/t10-pi.c
index 62aed77d0bb9..0c0094609dd6 100644
--- a/block/t10-pi.c
+++ b/block/t10-pi.c
@@ -1,24 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* t10_pi.c - Functions for generating and verifying T10 Protection
* Information.
- *
- * Copyright (C) 2007, 2008, 2014 Oracle Corporation
- * Written by: Martin K. Petersen <martin.petersen@oracle.com>
- *
- * 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; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
- * USA.
- *
*/
#include <linux/t10-pi.h>
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 077cecdf9437..ea73df36529a 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -1,19 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2001 Jens Axboe <axboe@suse.de>
- *
- * 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 Licens
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
*/
#ifndef __LINUX_BIO_H
#define __LINUX_BIO_H
diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index a4811410e4fc..545a480528e0 100644
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* bvec iterator
*
* Copyright (C) 2001 Ming Lei <ming.lei@canonical.com>
- *
- * 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 Licens
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
*/
#ifndef __LINUX_BVEC_ITER_H
#define __LINUX_BVEC_ITER_H
diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h
index 04b124fca51e..3e76b6d7d97f 100644
--- a/include/linux/sed-opal.h
+++ b/include/linux/sed-opal.h
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright © 2016 Intel Corporation
*
* Authors:
* Rafael Antognolli <rafael.antognolli@intel.com>
* Scott Bauer <scott.bauer@intel.com>
- *
- * 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 LINUX_OPAL_H
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] block: switch all files cleared marked as GPLv2 to SPDX tags
2019-04-30 18:42 ` [PATCH 1/5] block: switch all files cleared marked as GPLv2 to SPDX tags Christoph Hellwig
@ 2019-04-30 21:38 ` Chaitanya Kulkarni
0 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:38 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> All these files have some form of the usual GPLv2 boilerplate. Switch
> them to use SPDX tags instead.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/badblocks.c | 10 +---------
> block/bio-integrity.c | 16 +---------------
> block/bio.c | 15 +--------------
> block/blk-flush.c | 3 +--
> block/blk-integrity.c | 16 +---------------
> block/blk-mq-debugfs.c | 13 +------------
> block/blk-mq-pci.c | 10 +---------
> block/blk-mq-rdma.c | 10 +---------
> block/blk-mq-virtio.c | 10 +---------
> block/bsg.c | 9 +--------
> block/kyber-iosched.c | 13 +------------
> block/opal_proto.h | 10 +---------
> block/partitions/acorn.c | 7 +------
> block/scsi_ioctl.c | 16 +---------------
> block/sed-opal.c | 10 +---------
> block/t10-pi.c | 19 +------------------
> include/linux/bio.h | 15 +--------------
> include/linux/bvec.h | 15 +--------------
> include/linux/sed-opal.h | 10 +---------
> 19 files changed, 19 insertions(+), 208 deletions(-)
>
> diff --git a/block/badblocks.c b/block/badblocks.c
> index 91f7bcf979d3..2e5f5697db35 100644
> --- a/block/badblocks.c
> +++ b/block/badblocks.c
> @@ -1,18 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Bad block management
> *
> * - Heavily based on MD badblocks code from Neil Brown
> *
> * 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/badblocks.h>
> diff --git a/block/bio-integrity.c b/block/bio-integrity.c
> index 1b633a3526d4..42536674020a 100644
> --- a/block/bio-integrity.c
> +++ b/block/bio-integrity.c
> @@ -1,23 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * bio-integrity.c - bio data integrity extensions
> *
> * Copyright (C) 2007, 2008, 2009 Oracle Corporation
> * Written by: Martin K. Petersen <martin.petersen@oracle.com>
> - *
> - * 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; see the file COPYING. If not, write to
> - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
> - * USA.
> - *
> */
>
> #include <linux/blkdev.h>
> diff --git a/block/bio.c b/block/bio.c
> index 029afb121a48..683cbb40f051 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -1,19 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (C) 2001 Jens Axboe <axboe@kernel.dk>
> - *
> - * 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 Licens
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
> - *
> */
> #include <linux/mm.h>
> #include <linux/swap.h>
> diff --git a/block/blk-flush.c b/block/blk-flush.c
> index d95f94892015..aedd9320e605 100644
> --- a/block/blk-flush.c
> +++ b/block/blk-flush.c
> @@ -1,11 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Functions to sequence PREFLUSH and FUA writes.
> *
> * Copyright (C) 2011 Max Planck Institute for Gravitational Physics
> * Copyright (C) 2011 Tejun Heo <tj@kernel.org>
> *
> - * This file is released under the GPLv2.
> - *
> * REQ_{PREFLUSH|FUA} requests are decomposed to sequences consisted of three
> * optional steps - PREFLUSH, DATA and POSTFLUSH - according to the request
> * properties and hardware capability.
> diff --git a/block/blk-integrity.c b/block/blk-integrity.c
> index d1ab089e0919..7f302f7b9d84 100644
> --- a/block/blk-integrity.c
> +++ b/block/blk-integrity.c
> @@ -1,23 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * blk-integrity.c - Block layer data integrity extensions
> *
> * Copyright (C) 2007, 2008 Oracle Corporation
> * Written by: Martin K. Petersen <martin.petersen@oracle.com>
> - *
> - * 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; see the file COPYING. If not, write to
> - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
> - * USA.
> - *
> */
>
> #include <linux/blkdev.h>
> diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
> index ec1d18cb643c..6aea0ebc3a73 100644
> --- a/block/blk-mq-debugfs.c
> +++ b/block/blk-mq-debugfs.c
> @@ -1,17 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (C) 2017 Facebook
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public
> - * License v2 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, see <https://www.gnu.org/licenses/>.
> */
>
> #include <linux/kernel.h>
> diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
> index 1dce18553984..ad4545a2a98b 100644
> --- a/block/blk-mq-pci.c
> +++ b/block/blk-mq-pci.c
> @@ -1,14 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (c) 2016 Christoph Hellwig.
> - *
> - * 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/kobject.h>
> #include <linux/blkdev.h>
> diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c
> index 45030a81a1ed..cc921e6ba709 100644
> --- a/block/blk-mq-rdma.c
> +++ b/block/blk-mq-rdma.c
> @@ -1,14 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (c) 2017 Sagi Grimberg.
> - *
> - * 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/blk-mq.h>
> #include <linux/blk-mq-rdma.h>
> diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
> index 370827163835..75a52c18a8f6 100644
> --- a/block/blk-mq-virtio.c
> +++ b/block/blk-mq-virtio.c
> @@ -1,14 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (c) 2016 Christoph Hellwig.
> - *
> - * 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/device.h>
> #include <linux/blk-mq.h>
> diff --git a/block/bsg.c b/block/bsg.c
> index f306853c6b08..833c44b3d458 100644
> --- a/block/bsg.c
> +++ b/block/bsg.c
> @@ -1,13 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * bsg.c - block layer implementation of the sg v4 interface
> - *
> - * Copyright (C) 2004 Jens Axboe <axboe@suse.de> SUSE Labs
> - * Copyright (C) 2004 Peter M. Jones <pjones@redhat.com>
> - *
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License version 2. See the file "COPYING" in the main directory of this
> - * archive for more details.
> - *
> */
> #include <linux/module.h>
> #include <linux/init.h>
> diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
> index ec6a04e01bc1..c3b05119cebd 100644
> --- a/block/kyber-iosched.c
> +++ b/block/kyber-iosched.c
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * The Kyber I/O scheduler. Controls latency by throttling queue depths using
> * scalable techniques.
> *
> * Copyright (C) 2017 Facebook
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public
> - * License v2 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, see <https://www.gnu.org/licenses/>.
> */
>
> #include <linux/kernel.h>
> diff --git a/block/opal_proto.h b/block/opal_proto.h
> index b6e352cfe982..d9a05ad02eb5 100644
> --- a/block/opal_proto.h
> +++ b/block/opal_proto.h
> @@ -1,18 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright © 2016 Intel Corporation
> *
> * Authors:
> * Rafael Antognolli <rafael.antognolli@intel.com>
> * Scott Bauer <scott.bauer@intel.com>
> - *
> - * 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/types.h>
>
> diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c
> index fbeb697374d5..7587700fad4a 100644
> --- a/block/partitions/acorn.c
> +++ b/block/partitions/acorn.c
> @@ -1,12 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> - * linux/fs/partitions/acorn.c
> - *
> * Copyright (c) 1996-2000 Russell King.
> *
> - * 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.
> - *
> * Scan ADFS partitions on hard disk drives. Unfortunately, there
> * isn't a standard for partitioning drives on Acorn machines, so
> * every single manufacturer of SCSI and IDE cards created their own
> diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
> index 533f4aee8567..f5e0ad65e86a 100644
> --- a/block/scsi_ioctl.c
> +++ b/block/scsi_ioctl.c
> @@ -1,20 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (C) 2001 Jens Axboe <axboe@suse.de>
> - *
> - * 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 Licens
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
> - *
> */
> #include <linux/kernel.h>
> #include <linux/errno.h>
> diff --git a/block/sed-opal.c b/block/sed-opal.c
> index b1aa0cc25803..a46e8d13e16d 100644
> --- a/block/sed-opal.c
> +++ b/block/sed-opal.c
> @@ -1,18 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright © 2016 Intel Corporation
> *
> * Authors:
> * Scott Bauer <scott.bauer@intel.com>
> * Rafael Antognolli <rafael.antognolli@intel.com>
> - *
> - * 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.
> */
>
> #define pr_fmt(fmt) KBUILD_MODNAME ":OPAL: " fmt
> diff --git a/block/t10-pi.c b/block/t10-pi.c
> index 62aed77d0bb9..0c0094609dd6 100644
> --- a/block/t10-pi.c
> +++ b/block/t10-pi.c
> @@ -1,24 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * t10_pi.c - Functions for generating and verifying T10 Protection
> * Information.
> - *
> - * Copyright (C) 2007, 2008, 2014 Oracle Corporation
> - * Written by: Martin K. Petersen <martin.petersen@oracle.com>
> - *
> - * 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; see the file COPYING. If not, write to
> - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
> - * USA.
> - *
> */
>
> #include <linux/t10-pi.h>
> diff --git a/include/linux/bio.h b/include/linux/bio.h
> index 077cecdf9437..ea73df36529a 100644
> --- a/include/linux/bio.h
> +++ b/include/linux/bio.h
> @@ -1,19 +1,6 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright (C) 2001 Jens Axboe <axboe@suse.de>
> - *
> - * 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 Licens
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
> */
> #ifndef __LINUX_BIO_H
> #define __LINUX_BIO_H
> diff --git a/include/linux/bvec.h b/include/linux/bvec.h
> index a4811410e4fc..545a480528e0 100644
> --- a/include/linux/bvec.h
> +++ b/include/linux/bvec.h
> @@ -1,21 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * bvec iterator
> *
> * Copyright (C) 2001 Ming Lei <ming.lei@canonical.com>
> - *
> - * 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 Licens
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-
> */
> #ifndef __LINUX_BVEC_ITER_H
> #define __LINUX_BVEC_ITER_H
> diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h
> index 04b124fca51e..3e76b6d7d97f 100644
> --- a/include/linux/sed-opal.h
> +++ b/include/linux/sed-opal.h
> @@ -1,18 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * Copyright © 2016 Intel Corporation
> *
> * Authors:
> * Rafael Antognolli <rafael.antognolli@intel.com>
> * Scott Bauer <scott.bauer@intel.com>
> - *
> - * 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 LINUX_OPAL_H
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later to SPDX tags
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
2019-04-30 18:42 ` [PATCH 1/5] block: switch all files cleared marked as GPLv2 to SPDX tags Christoph Hellwig
@ 2019-04-30 18:42 ` Christoph Hellwig
2019-04-30 21:38 ` Chaitanya Kulkarni
2019-04-30 18:42 ` [PATCH 3/5] sed-opal.h: remove redundant licence boilerplate Christoph Hellwig
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2019-04-30 18:42 UTC (permalink / raw)
To: Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
All these files have some form of the usual GPLv2 or later boilerplate.
Switch them to use SPDX tags instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/bfq-cgroup.c | 11 +----------
block/bfq-iosched.c | 11 +----------
block/bfq-iosched.h | 11 +----------
block/bfq-wf2q.c | 11 +----------
block/bsg-lib.c | 16 +---------------
block/partitions/efi.c | 16 +---------------
block/partitions/efi.h | 16 +---------------
block/partitions/ldm.c | 16 +---------------
block/partitions/ldm.h | 16 +---------------
include/linux/bsg-lib.h | 16 +---------------
10 files changed, 10 insertions(+), 130 deletions(-)
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 793c027ca60e..b3796a40a61a 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -1,15 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* cgroups support for the BFQ I/O scheduler.
- *
- * 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 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.
*/
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b85a4ab8b9db..f8d430f88d25 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Budget Fair Queueing (BFQ) I/O scheduler.
*
@@ -12,16 +13,6 @@
*
* Copyright (C) 2017 Paolo Valente <paolo.valente@linaro.org>
*
- * 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 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.
- *
* BFQ is a proportional-share I/O scheduler, with some extra
* low-latency capabilities. BFQ also supports full hierarchical
* scheduling through cgroups. Next paragraphs provide an introduction
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index eba7cd449ab4..c2faa77824f8 100644
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -1,16 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Header file for the BFQ I/O scheduler: data structures and
* prototypes of interface functions among BFQ components.
- *
- * 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 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.
*/
#ifndef _BFQ_H
#define _BFQ_H
diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 48d899cfbe03..c9ba225081ce 100644
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Hierarchical Budget Worst-case Fair Weighted Fair Queueing
* (B-WF2Q+): hierarchical scheduling algorithm by which the BFQ I/O
* scheduler schedules generic entities. The latter can represent
* either single bfq queues (associated with processes) or groups of
* bfq queues (associated with cgroups).
- *
- * 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 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.
*/
#include "bfq-iosched.h"
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 005e2b75d775..b898a1cdf872 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* BSG helper library
*
* Copyright (C) 2008 James Smart, Emulex Corporation
* Copyright (C) 2011 Red Hat, Inc. All rights reserved.
* Copyright (C) 2011 Mike Christie
- *
- * 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 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/slab.h>
#include <linux/blk-mq.h>
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index 39f70d968754..db2fef7dfc47 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/************************************************************
* EFI GUID Partition Table handling
*
@@ -7,21 +8,6 @@
* efi.[ch] by Matt Domsch <Matt_Domsch@dell.com>
* Copyright 2000,2001,2002,2004 Dell Inc.
*
- * 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 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
- *
- *
* TODO:
*
* Changelog:
diff --git a/block/partitions/efi.h b/block/partitions/efi.h
index abd0b19288a6..3e8576157575 100644
--- a/block/partitions/efi.h
+++ b/block/partitions/efi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/************************************************************
* EFI GUID Partition Table
* Per Intel EFI Specification v1.02
@@ -5,21 +6,6 @@
*
* By Matt Domsch <Matt_Domsch@dell.com> Fri Sep 22 22:15:56 CDT 2000
* Copyright 2000,2001 Dell Inc.
- *
- * 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 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
- *
************************************************************/
#ifndef FS_PART_EFI_H_INCLUDED
diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
index 16766f267559..6db573f33219 100644
--- a/block/partitions/ldm.c
+++ b/block/partitions/ldm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/**
* ldm - Support for Windows Logical Disk Manager (Dynamic Disks)
*
@@ -6,21 +7,6 @@
* Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@telia.com>
*
* Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
- *
- * 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 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 (in the main directory of the source in the file COPYING); if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
*/
#include <linux/slab.h>
diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
index f4c6055df956..1ca63e97bccc 100644
--- a/block/partitions/ldm.h
+++ b/block/partitions/ldm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/**
* ldm - Part of the Linux-NTFS project.
*
@@ -6,21 +7,6 @@
* Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@telia.com>
*
* Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
- *
- * 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 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 (in the main directory of the Linux-NTFS source
- * in the file COPYING); if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _FS_PT_LDM_H_
diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h
index 7f14517a559b..960988d42f77 100644
--- a/include/linux/bsg-lib.h
+++ b/include/linux/bsg-lib.h
@@ -1,24 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* BSG helper library
*
* Copyright (C) 2008 James Smart, Emulex Corporation
* Copyright (C) 2011 Red Hat, Inc. All rights reserved.
* Copyright (C) 2011 Mike Christie
- *
- * 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 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
- *
*/
#ifndef _BLK_BSG_
#define _BLK_BSG_
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later to SPDX tags
2019-04-30 18:42 ` [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later " Christoph Hellwig
@ 2019-04-30 21:38 ` Chaitanya Kulkarni
0 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:38 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> All these files have some form of the usual GPLv2 or later boilerplate.
> Switch them to use SPDX tags instead.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/bfq-cgroup.c | 11 +----------
> block/bfq-iosched.c | 11 +----------
> block/bfq-iosched.h | 11 +----------
> block/bfq-wf2q.c | 11 +----------
> block/bsg-lib.c | 16 +---------------
> block/partitions/efi.c | 16 +---------------
> block/partitions/efi.h | 16 +---------------
> block/partitions/ldm.c | 16 +---------------
> block/partitions/ldm.h | 16 +---------------
> include/linux/bsg-lib.h | 16 +---------------
> 10 files changed, 10 insertions(+), 130 deletions(-)
>
> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
> index 793c027ca60e..b3796a40a61a 100644
> --- a/block/bfq-cgroup.c
> +++ b/block/bfq-cgroup.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * cgroups support for the BFQ I/O scheduler.
> - *
> - * 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 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.
> */
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index b85a4ab8b9db..f8d430f88d25 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Budget Fair Queueing (BFQ) I/O scheduler.
> *
> @@ -12,16 +13,6 @@
> *
> * Copyright (C) 2017 Paolo Valente <paolo.valente@linaro.org>
> *
> - * 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 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.
> - *
> * BFQ is a proportional-share I/O scheduler, with some extra
> * low-latency capabilities. BFQ also supports full hierarchical
> * scheduling through cgroups. Next paragraphs provide an introduction
> diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
> index eba7cd449ab4..c2faa77824f8 100644
> --- a/block/bfq-iosched.h
> +++ b/block/bfq-iosched.h
> @@ -1,16 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Header file for the BFQ I/O scheduler: data structures and
> * prototypes of interface functions among BFQ components.
> - *
> - * 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 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.
> */
> #ifndef _BFQ_H
> #define _BFQ_H
> diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
> index 48d899cfbe03..c9ba225081ce 100644
> --- a/block/bfq-wf2q.c
> +++ b/block/bfq-wf2q.c
> @@ -1,19 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Hierarchical Budget Worst-case Fair Weighted Fair Queueing
> * (B-WF2Q+): hierarchical scheduling algorithm by which the BFQ I/O
> * scheduler schedules generic entities. The latter can represent
> * either single bfq queues (associated with processes) or groups of
> * bfq queues (associated with cgroups).
> - *
> - * 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 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.
> */
> #include "bfq-iosched.h"
>
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 005e2b75d775..b898a1cdf872 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -1,24 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * BSG helper library
> *
> * Copyright (C) 2008 James Smart, Emulex Corporation
> * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
> * Copyright (C) 2011 Mike Christie
> - *
> - * 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 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/slab.h>
> #include <linux/blk-mq.h>
> diff --git a/block/partitions/efi.c b/block/partitions/efi.c
> index 39f70d968754..db2fef7dfc47 100644
> --- a/block/partitions/efi.c
> +++ b/block/partitions/efi.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /************************************************************
> * EFI GUID Partition Table handling
> *
> @@ -7,21 +8,6 @@
> * efi.[ch] by Matt Domsch <Matt_Domsch@dell.com>
> * Copyright 2000,2001,2002,2004 Dell Inc.
> *
> - * 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 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
> - *
> - *
> * TODO:
> *
> * Changelog:
> diff --git a/block/partitions/efi.h b/block/partitions/efi.h
> index abd0b19288a6..3e8576157575 100644
> --- a/block/partitions/efi.h
> +++ b/block/partitions/efi.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /************************************************************
> * EFI GUID Partition Table
> * Per Intel EFI Specification v1.02
> @@ -5,21 +6,6 @@
> *
> * By Matt Domsch <Matt_Domsch@dell.com> Fri Sep 22 22:15:56 CDT 2000
> * Copyright 2000,2001 Dell Inc.
> - *
> - * 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 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
> - *
> ************************************************************/
>
> #ifndef FS_PART_EFI_H_INCLUDED
> diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
> index 16766f267559..6db573f33219 100644
> --- a/block/partitions/ldm.c
> +++ b/block/partitions/ldm.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /**
> * ldm - Support for Windows Logical Disk Manager (Dynamic Disks)
> *
> @@ -6,21 +7,6 @@
> * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@telia.com>
> *
> * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
> - *
> - * 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 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 (in the main directory of the source in the file COPYING); if
> - * not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
> - * Boston, MA 02111-1307 USA
> */
>
> #include <linux/slab.h>
> diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
> index f4c6055df956..1ca63e97bccc 100644
> --- a/block/partitions/ldm.h
> +++ b/block/partitions/ldm.h
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /**
> * ldm - Part of the Linux-NTFS project.
> *
> @@ -6,21 +7,6 @@
> * Copyright (C) 2001,2002 Jakob Kemi <jakob.kemi@telia.com>
> *
> * Documentation is available at http://www.linux-ntfs.org/doku.php?id=downloads
> - *
> - * 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 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 (in the main directory of the Linux-NTFS source
> - * in the file COPYING); if not, write to the Free Software Foundation,
> - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> #ifndef _FS_PT_LDM_H_
> diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h
> index 7f14517a559b..960988d42f77 100644
> --- a/include/linux/bsg-lib.h
> +++ b/include/linux/bsg-lib.h
> @@ -1,24 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * BSG helper library
> *
> * Copyright (C) 2008 James Smart, Emulex Corporation
> * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
> * Copyright (C) 2011 Mike Christie
> - *
> - * 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 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
> - *
> */
> #ifndef _BLK_BSG_
> #define _BLK_BSG_
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] sed-opal.h: remove redundant licence boilerplate
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
2019-04-30 18:42 ` [PATCH 1/5] block: switch all files cleared marked as GPLv2 to SPDX tags Christoph Hellwig
2019-04-30 18:42 ` [PATCH 2/5] block: switch all files cleared marked as GPLv2 or later " Christoph Hellwig
@ 2019-04-30 18:42 ` Christoph Hellwig
2019-04-30 21:38 ` Chaitanya Kulkarni
2019-04-30 18:42 ` [PATCH 4/5] block: add a SPDX tag to blk-mq-rdma.h Christoph Hellwig
` (2 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2019-04-30 18:42 UTC (permalink / raw)
To: Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
The file already has the correct SPDX header.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/uapi/linux/sed-opal.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h
index e092e124dd16..33e53b80cd1f 100644
--- a/include/uapi/linux/sed-opal.h
+++ b/include/uapi/linux/sed-opal.h
@@ -5,15 +5,6 @@
* Authors:
* Rafael Antognolli <rafael.antognolli@intel.com>
* Scott Bauer <scott.bauer@intel.com>
- *
- * 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 _UAPI_SED_OPAL_H
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] sed-opal.h: remove redundant licence boilerplate
2019-04-30 18:42 ` [PATCH 3/5] sed-opal.h: remove redundant licence boilerplate Christoph Hellwig
@ 2019-04-30 21:38 ` Chaitanya Kulkarni
0 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:38 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> The file already has the correct SPDX header.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> include/uapi/linux/sed-opal.h | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h
> index e092e124dd16..33e53b80cd1f 100644
> --- a/include/uapi/linux/sed-opal.h
> +++ b/include/uapi/linux/sed-opal.h
> @@ -5,15 +5,6 @@
> * Authors:
> * Rafael Antognolli <rafael.antognolli@intel.com>
> * Scott Bauer <scott.bauer@intel.com>
> - *
> - * 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 _UAPI_SED_OPAL_H
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/5] block: add a SPDX tag to blk-mq-rdma.h
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
` (2 preceding siblings ...)
2019-04-30 18:42 ` [PATCH 3/5] sed-opal.h: remove redundant licence boilerplate Christoph Hellwig
@ 2019-04-30 18:42 ` Christoph Hellwig
2019-04-30 21:39 ` Chaitanya Kulkarni
2019-04-30 18:42 ` [PATCH 5/5] block: add SPDX tags to block layer files missing licensing information Christoph Hellwig
2019-04-30 22:12 ` add SPDX tags to all block layer files Jens Axboe
5 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2019-04-30 18:42 UTC (permalink / raw)
To: Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
This file has no copyright notice, but was added as part of a commit
adding another file using the default kernel GPLv2 license. Add
a matching SPDX tag.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/blk-mq-rdma.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/blk-mq-rdma.h b/include/linux/blk-mq-rdma.h
index 7b6ecf9ac4c3..5cc5f0f36218 100644
--- a/include/linux/blk-mq-rdma.h
+++ b/include/linux/blk-mq-rdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _LINUX_BLK_MQ_RDMA_H
#define _LINUX_BLK_MQ_RDMA_H
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] block: add a SPDX tag to blk-mq-rdma.h
2019-04-30 18:42 ` [PATCH 4/5] block: add a SPDX tag to blk-mq-rdma.h Christoph Hellwig
@ 2019-04-30 21:39 ` Chaitanya Kulkarni
0 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:39 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> This file has no copyright notice, but was added as part of a commit
> adding another file using the default kernel GPLv2 license. Add
> a matching SPDX tag.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> include/linux/blk-mq-rdma.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/blk-mq-rdma.h b/include/linux/blk-mq-rdma.h
> index 7b6ecf9ac4c3..5cc5f0f36218 100644
> --- a/include/linux/blk-mq-rdma.h
> +++ b/include/linux/blk-mq-rdma.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> #ifndef _LINUX_BLK_MQ_RDMA_H
> #define _LINUX_BLK_MQ_RDMA_H
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/5] block: add SPDX tags to block layer files missing licensing information
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
` (3 preceding siblings ...)
2019-04-30 18:42 ` [PATCH 4/5] block: add a SPDX tag to blk-mq-rdma.h Christoph Hellwig
@ 2019-04-30 18:42 ` Christoph Hellwig
2019-04-30 21:39 ` Chaitanya Kulkarni
2019-04-30 22:12 ` add SPDX tags to all block layer files Jens Axboe
5 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2019-04-30 18:42 UTC (permalink / raw)
To: Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Various block layer files do not have any licensing information at all.
Add SPDX tags for the default kernel GPLv2 license to those.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-cgroup.c | 1 +
block/blk-core.c | 1 +
block/blk-exec.c | 1 +
block/blk-iolatency.c | 1 +
block/blk-mq-cpumap.c | 1 +
block/blk-mq-sched.c | 1 +
block/blk-mq-sysfs.c | 1 +
block/blk-mq-tag.c | 1 +
block/blk-mq.c | 1 +
block/blk-rq-qos.c | 2 ++
block/blk-rq-qos.h | 1 +
block/blk-settings.c | 1 +
block/blk-stat.c | 1 +
block/blk-timeout.c | 1 +
block/blk-wbt.c | 1 +
block/blk-zoned.c | 1 +
block/elevator.c | 1 +
block/genhd.c | 1 +
block/ioctl.c | 1 +
block/ioprio.c | 1 +
block/mq-deadline.c | 1 +
block/partitions/aix.h | 1 +
block/partitions/amiga.h | 1 +
block/partitions/ibm.h | 1 +
block/partitions/karma.h | 1 +
block/partitions/msdos.h | 1 +
block/partitions/osf.h | 1 +
block/partitions/sgi.h | 1 +
block/partitions/sun.h | 1 +
block/partitions/sysv68.h | 1 +
block/partitions/ultrix.h | 1 +
31 files changed, 32 insertions(+)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 617a2b3f7582..b97b479e4f64 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Common Block IO controller cgroup interface
*
diff --git a/block/blk-core.c b/block/blk-core.c
index a55389ba8779..b044829135c9 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994, Karl Keyte: Added support for disk statistics
diff --git a/block/blk-exec.c b/block/blk-exec.c
index a34b7d918742..1db44ca0f4a6 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Functions related to setting various queue properties from drivers
*/
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 507212d75ee2..d22e61bced86 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Block rq-qos base io controller
*
diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c
index 03a534820271..48bebf00a5f3 100644
--- a/block/blk-mq-cpumap.c
+++ b/block/blk-mq-cpumap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* CPU <-> hardware queue mapping helpers
*
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index aa6bc5c02643..f6e3b10b52eb 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* blk-mq scheduling framework
*
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 3f9c3f4ac44c..61efc2a29e58 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/backing-dev.h>
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index a4931fc7be8a..7513c8eaabee 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Tag allocation using scalable bitmaps. Uses active queue tracking to support
* fairer distribution of tags between multiple submitters when a shared tag map
diff --git a/block/blk-mq.c b/block/blk-mq.c
index fc60ed7e940e..4f15adfbab29 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Block multiqueue core code
*
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index d169d7188fa6..3f55b56f24bc 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
#include "blk-rq-qos.h"
/*
diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h
index 564851889550..2300e038b9fa 100644
--- a/block/blk-rq-qos.h
+++ b/block/blk-rq-qos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef RQ_QOS_H
#define RQ_QOS_H
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 6375afaedcec..ec150f88db09 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Functions related to setting various queue properties from drivers
*/
diff --git a/block/blk-stat.c b/block/blk-stat.c
index 696a04176e4d..940f15d600f8 100644
--- a/block/blk-stat.c
+++ b/block/blk-stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Block stat tracking code
*
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 124c26128bf6..8aa68fae96ad 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Functions related to generic timeout handling of requests.
*/
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index fd166fbb0f65..313f45a37e9d 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* buffered writeback throttling. loosely based on CoDel. We can't drop
* packets for IO scheduling, so the logic is something like this:
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 2d98803faec2..ae7e91bd0618 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Zoned block device handling
*
diff --git a/block/elevator.c b/block/elevator.c
index 2e5399d9f40f..ec55d5fc0b3e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Block device elevator/IO-scheduler.
*
diff --git a/block/genhd.c b/block/genhd.c
index 83f5c33d1e80..ad6826628e79 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* gendisk handling
*/
diff --git a/block/ioctl.c b/block/ioctl.c
index 4825c78a6baa..15a0eb80ada9 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include <linux/capability.h>
#include <linux/blkdev.h>
#include <linux/export.h>
diff --git a/block/ioprio.c b/block/ioprio.c
index f9821080c92c..2e0559f157c8 100644
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* fs/ioprio.c
*
diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 14288f864e94..1876f5712bfd 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* MQ Deadline i/o scheduler - adaptation of the legacy deadline scheduler,
* for the blk-mq scheduling framework
diff --git a/block/partitions/aix.h b/block/partitions/aix.h
index e0c66a987523..b4449f0b9f2b 100644
--- a/block/partitions/aix.h
+++ b/block/partitions/aix.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
extern int aix_partition(struct parsed_partitions *state);
diff --git a/block/partitions/amiga.h b/block/partitions/amiga.h
index d094585cadaa..7e63f4d9d969 100644
--- a/block/partitions/amiga.h
+++ b/block/partitions/amiga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/amiga.h
*/
diff --git a/block/partitions/ibm.h b/block/partitions/ibm.h
index 08fb0804a812..8bf13febb2b6 100644
--- a/block/partitions/ibm.h
+++ b/block/partitions/ibm.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
int ibm_partition(struct parsed_partitions *);
diff --git a/block/partitions/karma.h b/block/partitions/karma.h
index c764b2e9df21..48e074d417fb 100644
--- a/block/partitions/karma.h
+++ b/block/partitions/karma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/karma.h
*/
diff --git a/block/partitions/msdos.h b/block/partitions/msdos.h
index 38c781c490b3..fcacfc486092 100644
--- a/block/partitions/msdos.h
+++ b/block/partitions/msdos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/msdos.h
*/
diff --git a/block/partitions/osf.h b/block/partitions/osf.h
index 20ed2315ec16..4d8088e7ea8c 100644
--- a/block/partitions/osf.h
+++ b/block/partitions/osf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/osf.h
*/
diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h
index b9553ebdd5a9..a5b77c3987cf 100644
--- a/block/partitions/sgi.h
+++ b/block/partitions/sgi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/sgi.h
*/
diff --git a/block/partitions/sun.h b/block/partitions/sun.h
index 2424baa8319f..ae1b9eed3fd7 100644
--- a/block/partitions/sun.h
+++ b/block/partitions/sun.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/sun.h
*/
diff --git a/block/partitions/sysv68.h b/block/partitions/sysv68.h
index bf2f5ffa97ac..4fb6b8ec78ae 100644
--- a/block/partitions/sysv68.h
+++ b/block/partitions/sysv68.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
extern int sysv68_partition(struct parsed_partitions *state);
diff --git a/block/partitions/ultrix.h b/block/partitions/ultrix.h
index a3cc00b2bded..9f676cead222 100644
--- a/block/partitions/ultrix.h
+++ b/block/partitions/ultrix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* fs/partitions/ultrix.h
*/
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] block: add SPDX tags to block layer files missing licensing information
2019-04-30 18:42 ` [PATCH 5/5] block: add SPDX tags to block layer files missing licensing information Christoph Hellwig
@ 2019-04-30 21:39 ` Chaitanya Kulkarni
0 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:39 UTC (permalink / raw)
To: Christoph Hellwig, Jens Axboe
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 11:44 AM, Christoph Hellwig wrote:
> Various block layer files do not have any licensing information at all.
> Add SPDX tags for the default kernel GPLv2 license to those.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-cgroup.c | 1 +
> block/blk-core.c | 1 +
> block/blk-exec.c | 1 +
> block/blk-iolatency.c | 1 +
> block/blk-mq-cpumap.c | 1 +
> block/blk-mq-sched.c | 1 +
> block/blk-mq-sysfs.c | 1 +
> block/blk-mq-tag.c | 1 +
> block/blk-mq.c | 1 +
> block/blk-rq-qos.c | 2 ++
> block/blk-rq-qos.h | 1 +
> block/blk-settings.c | 1 +
> block/blk-stat.c | 1 +
> block/blk-timeout.c | 1 +
> block/blk-wbt.c | 1 +
> block/blk-zoned.c | 1 +
> block/elevator.c | 1 +
> block/genhd.c | 1 +
> block/ioctl.c | 1 +
> block/ioprio.c | 1 +
> block/mq-deadline.c | 1 +
> block/partitions/aix.h | 1 +
> block/partitions/amiga.h | 1 +
> block/partitions/ibm.h | 1 +
> block/partitions/karma.h | 1 +
> block/partitions/msdos.h | 1 +
> block/partitions/osf.h | 1 +
> block/partitions/sgi.h | 1 +
> block/partitions/sun.h | 1 +
> block/partitions/sysv68.h | 1 +
> block/partitions/ultrix.h | 1 +
> 31 files changed, 32 insertions(+)
>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 617a2b3f7582..b97b479e4f64 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Common Block IO controller cgroup interface
> *
> diff --git a/block/blk-core.c b/block/blk-core.c
> index a55389ba8779..b044829135c9 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Copyright (C) 1991, 1992 Linus Torvalds
> * Copyright (C) 1994, Karl Keyte: Added support for disk statistics
> diff --git a/block/blk-exec.c b/block/blk-exec.c
> index a34b7d918742..1db44ca0f4a6 100644
> --- a/block/blk-exec.c
> +++ b/block/blk-exec.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Functions related to setting various queue properties from drivers
> */
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index 507212d75ee2..d22e61bced86 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Block rq-qos base io controller
> *
> diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c
> index 03a534820271..48bebf00a5f3 100644
> --- a/block/blk-mq-cpumap.c
> +++ b/block/blk-mq-cpumap.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * CPU <-> hardware queue mapping helpers
> *
> diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
> index aa6bc5c02643..f6e3b10b52eb 100644
> --- a/block/blk-mq-sched.c
> +++ b/block/blk-mq-sched.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * blk-mq scheduling framework
> *
> diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
> index 3f9c3f4ac44c..61efc2a29e58 100644
> --- a/block/blk-mq-sysfs.c
> +++ b/block/blk-mq-sysfs.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/backing-dev.h>
> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> index a4931fc7be8a..7513c8eaabee 100644
> --- a/block/blk-mq-tag.c
> +++ b/block/blk-mq-tag.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Tag allocation using scalable bitmaps. Uses active queue tracking to support
> * fairer distribution of tags between multiple submitters when a shared tag map
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index fc60ed7e940e..4f15adfbab29 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Block multiqueue core code
> *
> diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
> index d169d7188fa6..3f55b56f24bc 100644
> --- a/block/blk-rq-qos.c
> +++ b/block/blk-rq-qos.c
> @@ -1,3 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> #include "blk-rq-qos.h"
>
> /*
> diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h
> index 564851889550..2300e038b9fa 100644
> --- a/block/blk-rq-qos.h
> +++ b/block/blk-rq-qos.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> #ifndef RQ_QOS_H
> #define RQ_QOS_H
>
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index 6375afaedcec..ec150f88db09 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Functions related to setting various queue properties from drivers
> */
> diff --git a/block/blk-stat.c b/block/blk-stat.c
> index 696a04176e4d..940f15d600f8 100644
> --- a/block/blk-stat.c
> +++ b/block/blk-stat.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Block stat tracking code
> *
> diff --git a/block/blk-timeout.c b/block/blk-timeout.c
> index 124c26128bf6..8aa68fae96ad 100644
> --- a/block/blk-timeout.c
> +++ b/block/blk-timeout.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Functions related to generic timeout handling of requests.
> */
> diff --git a/block/blk-wbt.c b/block/blk-wbt.c
> index fd166fbb0f65..313f45a37e9d 100644
> --- a/block/blk-wbt.c
> +++ b/block/blk-wbt.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * buffered writeback throttling. loosely based on CoDel. We can't drop
> * packets for IO scheduling, so the logic is something like this:
> diff --git a/block/blk-zoned.c b/block/blk-zoned.c
> index 2d98803faec2..ae7e91bd0618 100644
> --- a/block/blk-zoned.c
> +++ b/block/blk-zoned.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Zoned block device handling
> *
> diff --git a/block/elevator.c b/block/elevator.c
> index 2e5399d9f40f..ec55d5fc0b3e 100644
> --- a/block/elevator.c
> +++ b/block/elevator.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Block device elevator/IO-scheduler.
> *
> diff --git a/block/genhd.c b/block/genhd.c
> index 83f5c33d1e80..ad6826628e79 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * gendisk handling
> */
> diff --git a/block/ioctl.c b/block/ioctl.c
> index 4825c78a6baa..15a0eb80ada9 100644
> --- a/block/ioctl.c
> +++ b/block/ioctl.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> #include <linux/capability.h>
> #include <linux/blkdev.h>
> #include <linux/export.h>
> diff --git a/block/ioprio.c b/block/ioprio.c
> index f9821080c92c..2e0559f157c8 100644
> --- a/block/ioprio.c
> +++ b/block/ioprio.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * fs/ioprio.c
> *
> diff --git a/block/mq-deadline.c b/block/mq-deadline.c
> index 14288f864e94..1876f5712bfd 100644
> --- a/block/mq-deadline.c
> +++ b/block/mq-deadline.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * MQ Deadline i/o scheduler - adaptation of the legacy deadline scheduler,
> * for the blk-mq scheduling framework
> diff --git a/block/partitions/aix.h b/block/partitions/aix.h
> index e0c66a987523..b4449f0b9f2b 100644
> --- a/block/partitions/aix.h
> +++ b/block/partitions/aix.h
> @@ -1 +1,2 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> extern int aix_partition(struct parsed_partitions *state);
> diff --git a/block/partitions/amiga.h b/block/partitions/amiga.h
> index d094585cadaa..7e63f4d9d969 100644
> --- a/block/partitions/amiga.h
> +++ b/block/partitions/amiga.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/amiga.h
> */
> diff --git a/block/partitions/ibm.h b/block/partitions/ibm.h
> index 08fb0804a812..8bf13febb2b6 100644
> --- a/block/partitions/ibm.h
> +++ b/block/partitions/ibm.h
> @@ -1 +1,2 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> int ibm_partition(struct parsed_partitions *);
> diff --git a/block/partitions/karma.h b/block/partitions/karma.h
> index c764b2e9df21..48e074d417fb 100644
> --- a/block/partitions/karma.h
> +++ b/block/partitions/karma.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/karma.h
> */
> diff --git a/block/partitions/msdos.h b/block/partitions/msdos.h
> index 38c781c490b3..fcacfc486092 100644
> --- a/block/partitions/msdos.h
> +++ b/block/partitions/msdos.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/msdos.h
> */
> diff --git a/block/partitions/osf.h b/block/partitions/osf.h
> index 20ed2315ec16..4d8088e7ea8c 100644
> --- a/block/partitions/osf.h
> +++ b/block/partitions/osf.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/osf.h
> */
> diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h
> index b9553ebdd5a9..a5b77c3987cf 100644
> --- a/block/partitions/sgi.h
> +++ b/block/partitions/sgi.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/sgi.h
> */
> diff --git a/block/partitions/sun.h b/block/partitions/sun.h
> index 2424baa8319f..ae1b9eed3fd7 100644
> --- a/block/partitions/sun.h
> +++ b/block/partitions/sun.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/sun.h
> */
> diff --git a/block/partitions/sysv68.h b/block/partitions/sysv68.h
> index bf2f5ffa97ac..4fb6b8ec78ae 100644
> --- a/block/partitions/sysv68.h
> +++ b/block/partitions/sysv68.h
> @@ -1 +1,2 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> extern int sysv68_partition(struct parsed_partitions *state);
> diff --git a/block/partitions/ultrix.h b/block/partitions/ultrix.h
> index a3cc00b2bded..9f676cead222 100644
> --- a/block/partitions/ultrix.h
> +++ b/block/partitions/ultrix.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
> * fs/partitions/ultrix.h
> */
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: add SPDX tags to all block layer files
2019-04-30 18:42 add SPDX tags to all block layer files Christoph Hellwig
` (4 preceding siblings ...)
2019-04-30 18:42 ` [PATCH 5/5] block: add SPDX tags to block layer files missing licensing information Christoph Hellwig
@ 2019-04-30 22:12 ` Jens Axboe
5 siblings, 0 replies; 12+ messages in thread
From: Jens Axboe @ 2019-04-30 22:12 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Josef Bacik, Paolo Valente, Damien Le Moal, Andrea Arcangeli,
Vivek Goyal, Fabio Checconi, Nauman Rafique, Arianna Avanzini,
linux-block, linux-kernel
On 4/30/19 12:42 PM, Christoph Hellwig wrote:
> Hi Jens,
>
> this series adds SPDX tags to all block layer files that are still
> missing them. The last patch adds them to files that didn't have
> any licensing, and I've cced everyone who is mentioned in the
> Copyright notices for these files to make sure no one has any
> disagreement with the fact that that they are per default under
> the kernels GPLv2 license.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 12+ messages in thread