Re: linux-next: manual merge of the jc_docs tree with the spdx tree

On Thu, Sep 17, 2020 at 12:16:56PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the jc_docs tree got a conflict in: > > MAINTAINERS > > between commit: > > 951f3e9f2086 ("net/qla3xxx: Convert to SPDX license identifiers") > > from the spdx tree and commit: > >

linux-next: manual merge of the jc_docs tree with the spdx tree

Hi all, Today's linux-next merge of the jc_docs tree got a conflict in: MAINTAINERS between commit: 951f3e9f2086 ("net/qla3xxx: Convert to SPDX license identifiers") from the spdx tree and commit: 51652804d018 ("MAINTAINERS: fix location of qlogic/LICENSE.qla3xxx") from the jc_docs tre