Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1504428 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-10-20 02:10 +0200 |
| Last post | 2016-10-20 08:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-20 02:10 +0200
Re: linux-next: manual merge of the net-next tree with the net tree Ido Schimmel <idosch@idosch.org> - 2016-10-20 08:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-10-20 02:10 +0200 |
| Subject | linux-next: manual merge of the net-next tree with the net tree |
| Message-ID | <su95M-8vP-13@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
include/linux/netdevice.h
net/core/dev.c
between commit:
e4961b076885 ("net: core: Correctly iterate over lower adjacency list")
from the net tree and commit:
1a3f060c1a47 ("net: Introduce new api for walking upper and lower devices")
f1170fd462c6 ("net: Remove all_adj_list and its references")
from the net-next tree.
I fixed it up (I just used the net-next tree version) 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 | Ido Schimmel <idosch@idosch.org> |
|---|---|
| Date | 2016-10-20 08:40 +0200 |
| Message-ID | <sufbb-3SB-9@gated-at.bofh.it> |
| In reply to | #1504428 |
On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> include/linux/netdevice.h
> net/core/dev.c
>
> between commit:
>
> e4961b076885 ("net: core: Correctly iterate over lower adjacency list")
>
> from the net tree and commit:
>
> 1a3f060c1a47 ("net: Introduce new api for walking upper and lower devices")
> f1170fd462c6 ("net: Remove all_adj_list and its references")
>
> from the net-next tree.
>
> I fixed it up (I just used the net-next tree version) and can carry the
> fix as necessary.
Yes, net-next is correct. Thanks Stephen!
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web