On Tue, May 29, 2018 at 09:15:22AM +0200, Daniel Vetter wrote: > This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f. > > Jani believes the noise is gone, so let's see whether it's really > gone, before we drop this hack. > > Cc: "Saarinen, Jani" <jani.saarinen@xxxxxxxxx> > Cc: Martin Peres <martin.peres@xxxxxxxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> Totally forgot about this. Finally pushed it out. -Daniel > --- > net/sched/sch_generic.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c > index aef2582badc5..39c144b6ff98 100644 > --- a/net/sched/sch_generic.c > +++ b/net/sched/sch_generic.c > @@ -468,12 +468,7 @@ static void dev_watchdog(struct timer_list *t) > } > } > > - /* 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) { > + if (some_queue_timedout) { > WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", > dev->name, netdev_drivername(dev), i); > dev->netdev_ops->ndo_tx_timeout(dev); > -- > 2.17.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
