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!