On Wed, Jun 19, 2019 at 09:39:13AM -0600, Rob Herring wrote:
> On Wed, Jun 19, 2019 at 6:59 AM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Jun 19, 2019 at 07:23:19PM +0900, Masahiro Yamada wrote:
> > > Hi.
> > >
> > > In this development cycle of Linux kernel,
> > > lots of files were converted to use SPDX
> > > instead of the license boilerplate.
> > >
> > > However.
> > >
> > > Some files were imported from a different project,
> > > and are periodically synchronized with the upstream.
> > > Have we discussed what to do about this case?
> > >
> > >
> > > For example, scripts/dtc/ is the case.
> > >
> > > The files in scripts/dtc/ are synced with the upstream
> > > device tree compiler.
> > >
> > > Rob Herring periodically runs scripts/dtc/update-dtc-source.sh
> > > to import outcome from the upstream.
> > >
> > >
> > > The upstream DTC has not adopted SPDX yet.
> > >
> > > Some files in Linux (e.g. scripts/dtc/dtc.c)
> > > have been converted to SPDX.
> > >
> > > So, they are out of sync now.
> > >
> > > The license boilerplate will come back
> > > when Rob runs scripts/dtc/update-dtc-source.sh
> > > next time.
> 
> Already has. It just happened and is in next. The policy is everything
> is upstream first and any changes to dtc in the kernel are rejected.
> 
> > >
> > > What shall we do?
> > >
> > > [1] Convert upstream DTC to SPDX
> > >
> > > This will be a happy solution if it is acceptable in DTC.
> > > Since we cannot push the decision of the kernel to a different
> > > project, this is totally up to David Gibson.
> >
> > That's fine with me :)
> 
> I'll do the work if David is okay with it.

I have no objection.


> > > [2] Change scripts/dtc/update-dtc-source.sh to
> > >     take care of the license block somehow
> >
> > That would also be good.
> >
> > > [3] Go back to license boilerplate, and keep the files
> > >     synced with the upstream
> > >     (and scripts/dtc/ should be excluded from the
> > >      SPDX conversion tool.)
> >
> > nothing is being excluded from the SPDX conversions, sorry.  The goal is
> > to do this for every file in the kernel tree.  Otherwise it's pointless.
> >
> > > Or, what else?
> >
> > Rob remembers to keep those first lines of the files intact when doing
> > the next sync?
> 
> Patches to the import script are welcome. The only thing I have to
> remember running the script is to add any new files. Otherwise, it's
> scripted so I don't have to remember anything.
> 
> Rob
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson