net merged into net-next
From: David Miller <davem@davemloft.net>
Date: 2018-01-17 05:19:26
Daniel, please double check my merge work especially wrt. your packet scheduler fix. Thanks!
net merged into net-next
3 messages, 3 authors, 2018-01-17 · open the first message on its own page
Re: net merged into net-next
From: Saeed Mahameed <hidden>
Date: 2018-01-17 07:27:59
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.
Re: net merged into net-next
From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2018-01-17 10:37:00
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!