lkml.org 
[lkml]   [2017]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: SPDX id conflicts
On Fri, Nov 03, 2017 at 07:57:38AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> I expect to get quite a few conflicts due to the addition of the SPDX
> license ids to many files overnight in Linus' tree. I will not be
> reporting these conflicts as they are mostly trivial.

They should all be trivial, as they all hit the first, or second, line
of the file, and I would be amazed if that caused conflicts.

> If anyone thinks otherwise, please let me know.

Nope, that's fine with me :)

thanks,

greg k-h

\
 
 \ /
  Last update: 2017-11-02 22:31    [W:0.047 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site