* linux-next: SPDX id conflicts
@ 2017-11-02 20:57 Stephen Rothwell
2017-11-02 21:29 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2017-11-02 20:57 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Linux-Next Mailing List, Greg Kroah-Hartman, Linus Torvalds
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.
If anyone thinks otherwise, please let me know.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: SPDX id conflicts
2017-11-02 20:57 linux-next: SPDX id conflicts Stephen Rothwell
@ 2017-11-02 21:29 ` Greg Kroah-Hartman
2017-11-02 22:10 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2017-11-02 21:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Kernel Mailing List, Linux-Next Mailing List,
Linus Torvalds
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: SPDX id conflicts
2017-11-02 21:29 ` Greg Kroah-Hartman
@ 2017-11-02 22:10 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2017-11-02 22:10 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Linux Kernel Mailing List, Linux-Next Mailing List,
Linus Torvalds
Hi Greg,
On Thu, 2 Nov 2017 22:29:56 +0100 Greg Kroah-Hartman <gregkh@linuxfoundation•org> wrote:
>
> 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.
8 so far, but 5 of those were files removed in linux-next trees.
The pain is that I have to check each one just in case there is some
other conflict :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-02 22:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-02 20:57 linux-next: SPDX id conflicts Stephen Rothwell
2017-11-02 21:29 ` Greg Kroah-Hartman
2017-11-02 22:10 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox