linux-next: manual merge of the net-next tree with Linus' tree
From: Stephen Rothwell
Date: Mon Jun 03 2019 - 20:34:47 EST
Today's linux-next merge of the net-next tree got a conflict in:
de6cc6515a44 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 153")
from Linus' tree and commit:
85993b8c9786 ("isdn: remove hisax driver")
from the net-next tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
Description: OpenPGP digital signature