lkml.org 
[lkml]   [2019]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the scsi tree with Linus' tree
On Thu, Jun 20, 2019 at 4:59 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> At what point does it become worth while to do a back merge of v5.2-rc4
> (I think the last of the SPDX changes went into there) to take care of
> all these (rather than Linus having to edit each of these files himself
> during the merge window)?

For just trivial conflicts like this that have no code, I really would
prefer no backmerges.

That said, I would tend to trust the due diligence that Thomas, Greg &
co have done, and am wondering why the scsi tree ends up having
different SPDX results in the first place..

Linus

\
 
 \ /
  Last update: 2019-06-21 02:08    [W:1.575 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site