iproute2: missing patches in branch net-next

iproute2: missing patches in branch net-next

[Nicolas Dichtel]

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

Re: iproute2: missing patches in branch net-next

[Stephen Hemminger]

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

I had to do a force update at one point to finish off one patch.
The net-next branch is temporary anyway until the next merge.

Re: iproute2: missing patches in branch net-next

[Stephen Hemminger]

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.

Re: iproute2: missing patches in branch net-next

[Daniel Borkmann]

On 05/28/2015 06:19 PM, Stephen Hemminger wrote:
> 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.

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

Re: iproute2: missing patches in branch net-next

[Stephen Hemminger]

On Thu, 28 May 2015 18:32:32 +0200
Daniel Borkmann <daniel@iogearbox.net> wrote:

> On 05/28/2015 06:19 PM, Stephen Hemminger wrote:
> > 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.
> 
> 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

I will go back and recreate what is missing.
Sorry for the confusion.

Re: iproute2: missing patches in branch net-next

[Daniel Borkmann]

On 05/29/2015 01:12 AM, Stephen Hemminger wrote:
...
> I will go back and recreate what is missing.
> Sorry for the confusion.

Great thanks, no problem.

Re: iproute2: missing patches in branch net-next

[Alexei Starovoitov]

On Fri, May 29, 2015 at 01:15:03AM +0200, Daniel Borkmann wrote:
> On 05/29/2015 01:12 AM, Stephen Hemminger wrote:
> ...
> >I will go back and recreate what is missing.
> >Sorry for the confusion.
> 
> Great thanks, no problem.

ping. Daniel's tc-bpf man page is still missing in iproute2 net-next...

Re: iproute2: missing patches in branch net-next

[Daniel Borkmann]

On 05/29/2015 01:15 AM, Daniel Borkmann wrote:
> On 05/29/2015 01:12 AM, Stephen Hemminger wrote:
> ...
>> I will go back and recreate what is missing.
>> Sorry for the confusion.
>
> Great thanks, no problem.

Hmm, two weeks have passed. :/ Is there any progress so far?