From: David Ahern <d...@cumulusnetworks.com> Date: Fri, 24 Mar 2017 14:32:42 -0600
> On 3/24/17 2:29 PM, David Miller wrote: >> From: David Ahern <d...@cumulusnetworks.com> >> Date: Thu, 23 Mar 2017 19:02:27 -0600 >> >>> Fix copy and paste error setting rt_ttl_propagate. >>> >>> Fixes: 5b441ac8784c1 ("mpls: allow TTL propagation to IP packets to be >>> configured") >>> Signed-off-by: David Ahern <d...@cumulusnetworks.com> >> >> Applied. >> > > Hi Dave: are you planning to merge net into net-next in the next few > days? I have more MPLS patches for net-next but I know there are > conflicts with changes in net. Wanted to get those patch sets out before > netdev week. I did a merge yesterday, so I am not likely to do another for about a week.