From: David S. Miller Date: Thu, 2 Nov 2017 07:10:40 +0000 (+0900) Subject: Merge branch 'net-sched-block-callbacks-follow-up' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=14e83bf82961aeebef41976139c61ab82c84a238;p=linux.git 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 --- 14e83bf82961aeebef41976139c61ab82c84a238