net merged into net-next

net merged into net-next

[David Miller]

Eric, please double check my merge work for net/ipv4/udp.c

In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu()
call to net/ipv4/udp.c

And in net-next you converted UDP sockets away from nulls lists.

Therefore I had to add a hlist_add_tail_rcu() implementation to
linux/rculist.h and use it in net/ipv4/udp.c

Please make sure this is fine and will work safely.

Thanks!

Re: net merged into net-next

[Eric Dumazet]

On Sat, 2016-04-23 at 20:12 -0400, David Miller wrote:
> Eric, please double check my merge work for net/ipv4/udp.c
> 
> In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu()
> call to net/ipv4/udp.c
> 
> And in net-next you converted UDP sockets away from nulls lists.
> 
> Therefore I had to add a hlist_add_tail_rcu() implementation to
> linux/rculist.h and use it in net/ipv4/udp.c
> 
> Please make sure this is fine and will work safely.
> 
> Thanks!

Looks fine to me, thanks David

Craig, please have a look ?

( commit 1602f49b58abcb0d34a5f0a29d68e7c1769547aa in net-next)

Re: net merged into net-next

[Craig Gallek]

Thanks David,
There was one other change that conflicts (functionally) with this
merge as well: 3b24d854cb35 ("tcp/dccp: do not touch listener
sk_refcnt under synflood")
It did a similar hlist_nulls -> hlist transform for the TCP stack.
I'll send a formal patch to address this as well.

Craig

On Sat, Apr 23, 2016 at 9:39 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> On Sat, 2016-04-23 at 20:12 -0400, David Miller wrote:
>> Eric, please double check my merge work for net/ipv4/udp.c
>>
>> In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu()
>> call to net/ipv4/udp.c
>>
>> And in net-next you converted UDP sockets away from nulls lists.
>>
>> Therefore I had to add a hlist_add_tail_rcu() implementation to
>> linux/rculist.h and use it in net/ipv4/udp.c
>>
>> Please make sure this is fine and will work safely.
>>
>> Thanks!
>
> Looks fine to me, thanks David
>
> Craig, please have a look ?
>
> ( commit 1602f49b58abcb0d34a5f0a29d68e7c1769547aa in net-next)
>
>

net merged into net-next

[David Miller]

There were a bunch of conflicts, but the issue seemed to be more about
quantity than difficulty in resolution.

Saeed, thanks for the conflict resolution guidance it helped a lot.  I
always like to do the resolutions by hand so I can double check things,
rather than pull a resolution from a GIT tree.  However I do use those
kinds of things to make sure I do the resolution correctly, so it is
helpful when you provide that for me.

Daniel and Alexei, there were some test case overlaps in the verifier
and stuff like that.  Please double check my work.

As stated the net-next tree is freezing tonight, please get your
changes in on time.

Thanks.

net merged into net-next

[David Miller]

Please double check my work, although the conflict resolutions were
relatively trivial this time.

Especially interested for some of us is that now both networking
tree have the fixes to objtool for gcc-8 which was causing tons
of bogus warnings to be emitted.  Recent upgrades to Fedora 28
would have noticed this...

Anyways, everyone should have clean builds now.

Re: net merged into net-next

[Jason Wang]

On 2018年01月21日 04:17, Cong Wang wrote:
> On Fri, Jan 19, 2018 at 8:02 PM, David Miller <davem@davemloft.net> wrote:
>> Cong, please check my conflict resolution of drivers/net/tun.c, thank
>> you.
> It looks good to me except I am not sure about the xdp_rxq_info_unreg()
> inside tun_cleanup_tx_ring().

Looks correct to me.

Thanks

Re: net merged into net-next

[Cong Wang]

On Fri, Jan 19, 2018 at 8:02 PM, David Miller <davem@davemloft.net> wrote:
>
> Cong, please check my conflict resolution of drivers/net/tun.c, thank
> you.

It looks good to me except I am not sure about the xdp_rxq_info_unreg()
inside tun_cleanup_tx_ring().

net merged into net-next

[David Miller]

Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.

Re: net merged into net-next

[Daniel Borkmann]

On 01/17/2018 06:19 AM, David Miller wrote:
> 
> Daniel, please double check my merge work especially wrt. your
> packet scheduler fix.

The merge resolution for the qdisc bits looks good to me, thanks!

Re: net merged into net-next

[Saeed Mahameed]

Dave,

The resolution of the mlx5_ifc conflict was wrong and it causes a build break in mlx5, oops :(.

I hope my resolution instructions in my pull request didn't mislead you.

I will post a patch.

-Saeed.

net merged into net-next

[David Miller]

Daniel, please double check my merge work especially wrt. your
packet scheduler fix.

Thanks!

net merged into net-next

[David Miller]

In preparation for the merge window I dumped the last set of bug fixes to
Linus and merged net into net-next for the final push into the merge
window.

Just FYI...

net merged into net-next

[David Miller]

Just FYI, I've merged 'net' into 'net-next'.