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