diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
| commit | f757b390faab6c38fe0887dc2123dcb615e21953 (patch) | |
| tree | bd3a7c81a775c362693bccaf00e2cef9e07e2eea /net | |
| parent | 443c053f51f9173042a2b45d0db7271cebe78198 (diff) | |
| parent | 4c82fd0506b4cc196a375d1200361fb0c5439acd (diff) | |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_generic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 3b0f62095803..e10273f68c6c 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -472,7 +472,12 @@ static void dev_watchdog(struct timer_list *t) } } - if (some_queue_timedout) { + /* The noise is pissing off our CI and upstream doesn't + * move on the bug report: + * + * https://bugzilla.kernel.org/show_bug.cgi?id=196399 + */ + if (some_queue_timedout && 0) { trace_net_dev_xmit_timeout(dev, i); WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", dev->name, netdev_drivername(dev), i); |