]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge branch 'net-sched-block-callbacks-follow-up'
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 07:10:40 +0000 (16:10 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 07:10:40 +0000 (16:10 +0900)
commit14e83bf82961aeebef41976139c61ab82c84a238
tree515a1b62dc8bf2d12c327a33491d8f8bd0d3e2da
parent928990631327cf00a9195e30fa22f7ae5f8d7e67
parent70b5aee46782208c14d93b715e9f62f7fec844f1
Merge branch 'net-sched-block-callbacks-follow-up'

Jiri Pirko says:

====================
net: sched: block callbacks follow-up

This patchset does a bit of cleanup of leftovers after block callbacks
patchset. The main part is patch 2, which restores the original handling
of tc offload feature flag.

---
v1->v2:
- rebased on top of current net-next (bnxt changes)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>