From: Stephen Hemminger <stephen@networkplumber.org>
To: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: netdev <netdev@vger.kernel.org>,
"John W. Linville" <linville@tuxdriver.com>,
Jiri Benc <jbenc@redhat.com>, Jiri Pirko <jiri@resnulli.us>,
David Ward <david.ward@ll.mit.edu>,
Jonathan Toppins <jtoppins@cumulusnetworks.com>,
Eric Dumazet <edumazet@google.com>
Subject: Re: iproute2: missing patches in branch net-next
Date: Thu, 28 May 2015 09:19:49 -0700 [thread overview]
Message-ID: <20150528091949.6cabe893@urahara> (raw)
In-Reply-To: <5566FC7C.1000200@6wind.com>
On Thu, 28 May 2015 13:31:08 +0200
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
> Hi Stephen,
>
> some patches that were recently included in iproute2 branch net-next are not
> visible anymore on kernel.org. It seems that the branch has been overridden
> (note the "forced update" when I've fetched it):
>
> $ git fetch
> remote: Counting objects: 65, done.
> remote: Compressing objects: 100% (65/65), done.
> remote: Total 65 (delta 58), reused 0 (delta 0)
> Unpacking objects: 100% (65/65), done.
> From git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
> + aacee2695a90...eb9d6e794b52 net-next -> origin/net-next (forced update)
> f043759dd492..c52827e9077f master -> origin/master
>
>
> The following patches are lost:
> aacee2695a90 tc: gred: Add support for TCA_GRED_LIMIT attribute
> b6ec53e3008a xfrmmonitor: allows to monitor in several netns
> 449b824ad196 ipmonitor: allows to monitor in several netns
> 3b0006f8183e ipmonitor: introduce print_headers
> 0628cddd9d5c libnetlink: introduce rtnl_listen_filter_t
> 2503247d58c3 man: update ip monitor page
> 6fc1f8add30b iplink_bond: add support for ad_actor and port_key options
> df1c7d9138ea codel: add ce_threshold support to codel & fc_codel
> 30eb304ecd1d tc: add support for Flower classifier
> 1a4dda7103bc ss: add support for bytes_acked & bytes_received
> 908755dc49df iproute2: GENEVE support
> f9b004020a89 Merge branch 'master' into net-next
> 8f42ceaf2491 Update kernels for net-next
>
>
> Regards,
> Nicolas
Ah found it was botched merge. The commits were still there locally.
Should be fixed now, but had to force back to known good state on net-next branch.
next prev parent reply other threads:[~2015-05-28 16:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-28 11:31 iproute2: missing patches in branch net-next Nicolas Dichtel
2015-05-28 16:14 ` Stephen Hemminger
2015-05-28 16:19 ` Stephen Hemminger [this message]
2015-05-28 16:32 ` Daniel Borkmann
2015-05-28 23:12 ` Stephen Hemminger
2015-05-28 23:15 ` Daniel Borkmann
2015-06-05 20:45 ` Alexei Starovoitov
2015-06-12 20:58 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150528091949.6cabe893@urahara \
--to=stephen@networkplumber.org \
--cc=david.ward@ll.mit.edu \
--cc=edumazet@google.com \
--cc=jbenc@redhat.com \
--cc=jiri@resnulli.us \
--cc=jtoppins@cumulusnetworks.com \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).