netdev - Re: iproute2: missing patches in branch net-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <55674320.2030002@iogearbox.net>
Date:	Thu, 28 May 2015 18:32:32 +0200
From:	Daniel Borkmann <daniel@...earbox.net>
To:	Stephen Hemminger <stephen@...workplumber.org>,
	Nicolas Dichtel <nicolas.dichtel@...nd.com>
CC:	netdev <netdev@...r.kernel.org>,
	"John W. Linville" <linville@...driver.com>,
	Jiri Benc <jbenc@...hat.com>, Jiri Pirko <jiri@...nulli.us>,
	David Ward <david.ward@...mit.edu>,
	Jonathan Toppins <jtoppins@...ulusnetworks.com>,
	Eric Dumazet <edumazet@...gle.com>
Subject: Re: iproute2: missing patches in branch net-next

On 05/28/2015 06:19 PM, Stephen Hemminger wrote:
> On Thu, 28 May 2015 13:31:08 +0200
> Nicolas Dichtel <nicolas.dichtel@...nd.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.

Okay, but now the iproute2 -next patches from last days are gone,
right? I noticed the tc man page bits applied from yesterday are
not in the -next tree anymore. Do you re-push those on top of the
current restored state?

Thanks,
Daniel
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html