Messages in this thread | | | From | Linus Torvalds <> | Date | Thu, 20 Jun 2019 17:07:20 -0700 | Subject | Re: 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
| |