* linux-next: manual merge of the net-next tree with the spdx tree
@ 2020-03-31 0:23 Stephen Rothwell
2020-03-31 16:44 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-31 0:23 UTC (permalink / raw)
To: David Miller, Networking, Greg KH
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jian Yang,
Masahiro Yamada
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/networking/timestamping/.gitignore
between commit:
d198b34f3855 (".gitignore: add SPDX License Identifier")
from the spdx tree and commit:
5ef5c90e3cb3 ("selftests: move timestamping selftests to net folder")
from the net-next tree.
I fixed it up (I just deleted 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.
--
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 net-next tree with the spdx tree
2020-03-31 0:23 linux-next: manual merge of the net-next tree with the spdx tree Stephen Rothwell
@ 2020-03-31 16:44 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2020-03-31 16:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Jian Yang, Masahiro Yamada
On Tue, Mar 31, 2020 at 11:23:34AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/networking/timestamping/.gitignore
>
> between commit:
>
> d198b34f3855 (".gitignore: add SPDX License Identifier")
>
> from the spdx tree and commit:
>
> 5ef5c90e3cb3 ("selftests: move timestamping selftests to net folder")
>
> from the net-next tree.
>
> I fixed it up (I just deleted 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.
That merge is fine, thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-31 16:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-31 0:23 linux-next: manual merge of the net-next tree with the spdx tree Stephen Rothwell
2020-03-31 16:44 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).