Skip to contentSkip to conversation

mtd: ubi: Update ubi-media.h to dual license

PATCH RESEND New Lionel Debieve 2 participants 3 messages Jun 4, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mtd: ubi: Update ubi-media.h to dual license

Resend the patch about license change, with ack from IBM.

Following previous mail about the dual license update for ubi-media.h file (ie http://lists.infradead.org/pipermail/linux-mtd/2018-January/078878.html),
this is the corresponding patch about the requested change.

Lionel Debieve (1):
mtd: ubi: Update ubi-media.h to dual license
Update license template using SPDX. Move the global layout of UBI
headers to dual license helping UBI to be the standard solution for raw NAND management.

 drivers/mtd/ubi/ubi-media.h | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
Signature · 1 line
2.15.1
#1 lore raw

PATCH RESEND 1/1 mtd: ubi: Update ubi-media.h to dual license

Update license template using SPDX. Move the global layout of UBI headers to dual license helping UBI to be the standard solution for raw NAND management.

---
 drivers/mtd/ubi/ubi-media.h | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/mtd/ubi/ubi-media.h +3 -19
index bfceae5a890e..195ff8ca8211 100644
@@ -1,28 +1,12 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
 /*
- * Copyright (c) International Business Machines Corp., 2006
- *
- * 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
- *
+ * Copyright (C) International Business Machines Corp., 2006
  * Authors: Artem Bityutskiy (???????????????? ??????????)
  *          Thomas Gleixner
  *          Frank Haverkamp
  *          Oliver Lohmann
  *          Andreas Arnez
- */
-
-/*
+ *
  * This file defines the layout of UBI headers and all the other UBI on-flash
  * data structures.
  */
Signature · 1 line
2.15.1
maintainer Applied
#2 lore raw

PATCH RESEND 1/1 mtd: ubi: Update ubi-media.h to dual license

Am Montag, 4. Juni 2018, 15:21:37 CEST schrieb Lionel Debieve:

Quoted 39 lines

Update license template using SPDX. Move the global layout of UBI headers to dual license helping UBI to be the standard solution for raw NAND management.

---
 drivers/mtd/ubi/ubi-media.h | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/mtd/ubi/ubi-media.h +2 -16
index bfceae5a890e..195ff8ca8211 100644
@@ -1,28 +1,12 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
 /*
- * Copyright (c) International Business Machines Corp., 2006
- *
- * 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
- *
+ * Copyright (C) International Business Machines Corp., 2006
  * Authors: Artem Bityutskiy (???????????????? ??????????)
  *          Thomas Gleixner

drivers/mtd/ubi/ubi-media.h line 12

Quoted 10 lines
drivers/mtd/ubi/ubi-media.h +1 -3
  *          Frank Haverkamp
  *          Oliver Lohmann
  *          Andreas Arnez
- */
-
-/*
+ *
  * This file defines the layout of UBI headers and all the other UBI on-flash
  * data structures.
  */

Applied.
Thanks everyone for sorting this out!

Thanks,
//richard