Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1504541
| Path | csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.roellig-ltd.de!open-news-network.org!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Ido Schimmel <idosch@idosch.org> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| Date | Thu, 20 Oct 2016 08:40:01 +0200 |
| Message-ID | <sufbb-3SB-9@gated-at.bofh.it> (permalink) |
| References | <su95M-8vP-13@gated-at.bofh.it> |
| Dkim-Signature | v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=KMyaZaPSUs2p8FEIuxIH2p1AYHY=; b=T8DPF KbRUrTLYLuigiGdIThxA0cFn6rHRBaFntpAUQuwba/EIAs0Sqed1F2m/OpT/2xpa 1A+jtyShS3H0XWQtu2JmxYKaDG9oTkJ357orK/b1U/fES/PxQDmeQ1Za2FfjXu6z EFcM/5lJ3VLCTBM6V7Zrc6NlFosKqOksXQo2jo= |
| X-Sasl-Enc | r9g3kBFzOsiGtlbjBr0BN86R0XpVSva6KWdHV2EMpEJ8 1476945456 |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=us-ascii |
| Content-Disposition | inline |
| User-Agent | Mutt/1.7.0 (2016-08-17) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 23 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ido Schimmel <idosch@mellanox.com>, David Ahern <dsa@cumulusnetworks.com> |
| X-Original-Date | Thu, 20 Oct 2016 09:37:35 +0300 |
| X-Original-Message-ID | <20161020063735.GA16644@splinter> |
| X-Original-References | <20161020110142.41162709@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1504541 |
Show key headers only | View raw
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!
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
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
csiph-web