Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1634686 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-05-03 03:10 +0200 |
| Last post | 2017-05-03 06:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-03 03:10 +0200
Re: linux-next: manual merge of the net-next tree with Linus' tree David Miller <davem@davemloft.net> - 2017-05-03 06:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-05-03 03:10 +0200 |
| Subject | linux-next: manual merge of the net-next tree with Linus' tree |
| Message-ID | <tCQXL-5Rp-1@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
arch/avr32/include/uapi/asm/socket.h
between commit:
26202873bb51 ("avr32: remove support for AVR32 architecture")
from Linus' tree and commits:
a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID"
5daab9db7b65 ("New getsockopt option to get socket cookie")
from the net-next tree.
I fixed it up (I 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.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-05-03 06:10 +0200 |
| Message-ID | <tCTLY-80o-7@gated-at.bofh.it> |
| In reply to | #1634686 |
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 May 2017 11:07:03 +1000
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> arch/avr32/include/uapi/asm/socket.h
>
> between commit:
>
> 26202873bb51 ("avr32: remove support for AVR32 architecture")
>
> from Linus' tree and commits:
>
> a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
> 6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID"
> 5daab9db7b65 ("New getsockopt option to get socket cookie")
>
> from the net-next tree.
>
> I fixed it up (I 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.
Duly noted in the pull request I sent to Linus, and now that he took
net-next in it is resolved in his tree.
Thanks!
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web