* linux-next: manual merge of the jc_docs tree with the spdx tree
@ 2020-09-17 2:16 Stephen Rothwell
2020-09-17 18:04 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-09-17 2:16 UTC (permalink / raw)
To: Jonathan Corbet, Greg KH
Cc: Mauro Carvalho Chehab, Thomas Gleixner, Linux Next Mailing List,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
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 tree.
I fixed it up (I used the former - which removed the line updated by the
latter) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the jc_docs tree with the spdx tree
2020-09-17 2:16 linux-next: manual merge of the jc_docs tree with the spdx tree Stephen Rothwell
@ 2020-09-17 18:04 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2020-09-17 18:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, Mauro Carvalho Chehab, Thomas Gleixner,
Linux Next Mailing List, Linux Kernel Mailing List
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:
>
> 51652804d018 ("MAINTAINERS: fix location of qlogic/LICENSE.qla3xxx")
>
> from the jc_docs tree.
>
> I fixed it up (I used the former - which removed the line updated by the
> latter) 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.
Merge is fine, thanks!
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-17 18:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-17 2:16 linux-next: manual merge of the jc_docs tree with the spdx tree Stephen Rothwell
2020-09-17 18:04 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.