Re: linux-next: manual merge of the scsi tree with Linus' tree

[Linus Torvalds]

On Thu, Jun 20, 2019 at 4:59 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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