Re: linux-next: manual merge of the net-next tree with the net tree

[Cong Wang]

On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> diff --cc net/sched/sch_generic.c
> index 1a2f9e964330,3e64d23e098c..000000000000
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
>                 }
>         }
>   #ifdef CONFIG_NET_SCHED
>  -      if (dev->qdisc)
>  +      if (dev->qdisc != &noop_qdisc)
> -               qdisc_hash_add(dev->qdisc);
> +               qdisc_hash_add(dev->qdisc, false);
>   #endif
>   }


Looks good to me.

Thanks.