Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-05-02 Thread sjg 
On Mon, Apr 17, 2017 at 07:47:34AM -0600, Simon Glass wrote:
> Hi Tom,
>
> On 17 April 2017 at 07:33, Tom Rini  wrote:
> >
> > On Mon, Apr 17, 2017 at 10:13:06PM +0900, Masahiro Yamada wrote:
> > > Hi Tom,
> > >
> > >
> > > 2017-04-17 22:05 GMT+09:00 Tom Rini :
> > > > On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:
> > > >
> > > >> These should follow the UBoot standard. Update them.
> > > >>
> > > >> Signed-off-by: Simon Glass 
> > > >> ---
> > > >>
> > > >>  include/fdt.h| 46 +-
> > > >>  include/libfdt.h | 46 +-
> > > >>  2 files changed, 2 insertions(+), 90 deletions(-)
> > > >
> > > > We're syncing these as-is, right?  If so, just like DTB files, we don't
> > > > need to whack in an SPDX tag as that just complicates future re-syncs.
> > >
> > > Do we have consistent policy for this?
> > >
> > > For example,
> > >
> > >   git show 5b8031ccb4e -- scripts/kconfig/
> > >
> > > ... complicates Kconfig re-syncs?
> >
> > We ought to be consistent here, and if you happen to stomp on that next
> > time you re-sync I really can't complain.  We certainly don't do it in
> > dtb files as that's just annoyed upstream when people have tried to push
> > the changes back up.  In cases where we are able to 100% drop-in
> > upstream files, it's best to not do the conversion.  In other cases, say
> > MTD and 78e9e71c83cf, we have other changes, re-sync requires attention
> > and we do have some U-Boot'isms, we might as well convert.
>
> These files are not exactly the same, since we have different header
> includes and a few other features that are not yet upstream. I am
> always comparing the files anyway so it's no bother to ignore the
> license at the top. The rest of the libfdt files in U-Boot use SPDX.

OK, thanks.

-- 
Tom

Applied to u-boot-fdt/next, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-17 Thread Tom Rini 
On Mon, Apr 17, 2017 at 07:47:34AM -0600, Simon Glass wrote:
> Hi Tom,
> 
> On 17 April 2017 at 07:33, Tom Rini  wrote:
> >
> > On Mon, Apr 17, 2017 at 10:13:06PM +0900, Masahiro Yamada wrote:
> > > Hi Tom,
> > >
> > >
> > > 2017-04-17 22:05 GMT+09:00 Tom Rini :
> > > > On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:
> > > >
> > > >> These should follow the UBoot standard. Update them.
> > > >>
> > > >> Signed-off-by: Simon Glass 
> > > >> ---
> > > >>
> > > >>  include/fdt.h| 46 +-
> > > >>  include/libfdt.h | 46 +-
> > > >>  2 files changed, 2 insertions(+), 90 deletions(-)
> > > >
> > > > We're syncing these as-is, right?  If so, just like DTB files, we don't
> > > > need to whack in an SPDX tag as that just complicates future re-syncs.
> > >
> > > Do we have consistent policy for this?
> > >
> > > For example,
> > >
> > >   git show 5b8031ccb4e -- scripts/kconfig/
> > >
> > > ... complicates Kconfig re-syncs?
> >
> > We ought to be consistent here, and if you happen to stomp on that next
> > time you re-sync I really can't complain.  We certainly don't do it in
> > dtb files as that's just annoyed upstream when people have tried to push
> > the changes back up.  In cases where we are able to 100% drop-in
> > upstream files, it's best to not do the conversion.  In other cases, say
> > MTD and 78e9e71c83cf, we have other changes, re-sync requires attention
> > and we do have some U-Boot'isms, we might as well convert.
> 
> These files are not exactly the same, since we have different header
> includes and a few other features that are not yet upstream. I am
> always comparing the files anyway so it's no bother to ignore the
> license at the top. The rest of the libfdt files in U-Boot use SPDX.

OK, thanks.

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-17 Thread Simon Glass 
Hi Tom,

On 17 April 2017 at 07:33, Tom Rini  wrote:
>
> On Mon, Apr 17, 2017 at 10:13:06PM +0900, Masahiro Yamada wrote:
> > Hi Tom,
> >
> >
> > 2017-04-17 22:05 GMT+09:00 Tom Rini :
> > > On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:
> > >
> > >> These should follow the UBoot standard. Update them.
> > >>
> > >> Signed-off-by: Simon Glass 
> > >> ---
> > >>
> > >>  include/fdt.h| 46 +-
> > >>  include/libfdt.h | 46 +-
> > >>  2 files changed, 2 insertions(+), 90 deletions(-)
> > >
> > > We're syncing these as-is, right?  If so, just like DTB files, we don't
> > > need to whack in an SPDX tag as that just complicates future re-syncs.
> >
> > Do we have consistent policy for this?
> >
> > For example,
> >
> >   git show 5b8031ccb4e -- scripts/kconfig/
> >
> > ... complicates Kconfig re-syncs?
>
> We ought to be consistent here, and if you happen to stomp on that next
> time you re-sync I really can't complain.  We certainly don't do it in
> dtb files as that's just annoyed upstream when people have tried to push
> the changes back up.  In cases where we are able to 100% drop-in
> upstream files, it's best to not do the conversion.  In other cases, say
> MTD and 78e9e71c83cf, we have other changes, re-sync requires attention
> and we do have some U-Boot'isms, we might as well convert.

These files are not exactly the same, since we have different header
includes and a few other features that are not yet upstream. I am
always comparing the files anyway so it's no bother to ignore the
license at the top. The rest of the libfdt files in U-Boot use SPDX.

Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-17 Thread Tom Rini 
On Mon, Apr 17, 2017 at 10:13:06PM +0900, Masahiro Yamada wrote:
> Hi Tom,
> 
> 
> 2017-04-17 22:05 GMT+09:00 Tom Rini :
> > On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:
> >
> >> These should follow the UBoot standard. Update them.
> >>
> >> Signed-off-by: Simon Glass 
> >> ---
> >>
> >>  include/fdt.h| 46 +-
> >>  include/libfdt.h | 46 +-
> >>  2 files changed, 2 insertions(+), 90 deletions(-)
> >
> > We're syncing these as-is, right?  If so, just like DTB files, we don't
> > need to whack in an SPDX tag as that just complicates future re-syncs.
> 
> Do we have consistent policy for this?
> 
> For example,
> 
>   git show 5b8031ccb4e -- scripts/kconfig/
> 
> ... complicates Kconfig re-syncs?

We ought to be consistent here, and if you happen to stomp on that next
time you re-sync I really can't complain.  We certainly don't do it in
dtb files as that's just annoyed upstream when people have tried to push
the changes back up.  In cases where we are able to 100% drop-in
upstream files, it's best to not do the conversion.  In other cases, say
MTD and 78e9e71c83cf, we have other changes, re-sync requires attention
and we do have some U-Boot'isms, we might as well convert.

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-17 Thread Masahiro Yamada 
Hi Tom,


2017-04-17 22:05 GMT+09:00 Tom Rini :
> On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:
>
>> These should follow the UBoot standard. Update them.
>>
>> Signed-off-by: Simon Glass 
>> ---
>>
>>  include/fdt.h| 46 +-
>>  include/libfdt.h | 46 +-
>>  2 files changed, 2 insertions(+), 90 deletions(-)
>
> We're syncing these as-is, right?  If so, just like DTB files, we don't
> need to whack in an SPDX tag as that just complicates future re-syncs.
>


Do we have consistent policy for this?

For example,

  git show 5b8031ccb4e -- scripts/kconfig/

... complicates Kconfig re-syncs?



-- 
Best Regards
Masahiro Yamada
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-17 Thread Tom Rini 
On Sun, Apr 16, 2017 at 08:22:17PM -0600, Simon Glass wrote:

> These should follow the UBoot standard. Update them.
> 
> Signed-off-by: Simon Glass 
> ---
> 
>  include/fdt.h| 46 +-
>  include/libfdt.h | 46 +-
>  2 files changed, 2 insertions(+), 90 deletions(-)

We're syncing these as-is, right?  If so, just like DTB files, we don't
need to whack in an SPDX tag as that just complicates future re-syncs.

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 03/19] fdt: Use SPDX format for licenses in the libfdt headers

2017-04-16 Thread Simon Glass 
These should follow the UBoot standard. Update them.

Signed-off-by: Simon Glass 
---

 include/fdt.h| 46 +-
 include/libfdt.h | 46 +-
 2 files changed, 2 insertions(+), 90 deletions(-)

diff --git a/include/fdt.h b/include/fdt.h
index 526aedb515..3134d78332 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -5,51 +5,7 @@
  * Copyright (C) 2006 David Gibson, IBM Corporation.
  * Copyright 2012 Kim Phillips, Freescale Semiconductor.
  *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library 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 library 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 library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above
- *copyright notice, this list of conditions and the following
- *disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *copyright notice, this list of conditions and the following
- *disclaimer in the documentation and/or other materials
- *provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
  */
 
 #ifndef __ASSEMBLY__
diff --git a/include/libfdt.h b/include/libfdt.h
index e2bc2e00c1..6d33065e80 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -4,51 +4,7 @@
  * libfdt - Flat Device Tree manipulation
  * Copyright (C) 2006 David Gibson, IBM Corporation.
  *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library 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 library 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 library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above
- *copyright notice, this list of conditions and the following
- *disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *copyright notice, this list of conditions and the following
- *disclaimer in the documentation and/or other materials
- *provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A