The patch titled Subject: a has been added to the -mm tree. Its filename is linux-next-fix-2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/linux-next-fix-2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-fix-2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: a Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 ------- 1 file changed, 7 deletions(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c~linux-next-fix-2 +++ a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c @@ -767,13 +767,6 @@ __mlxsw_sp_qdisc_ets_graft(struct mlxsw_ mlxsw_sp_port->tclass_qdiscs[tclass_num].handle == child_handle) return 0; - if (!p->child_handle) { - /* This is an invisible FIFO replacing the original Qdisc. - * Ignore it--the original Qdisc's destroy will follow. - */ - return 0; - } - /* See if the grafted qdisc is already offloaded on any tclass. If so, * unoffload it. */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm.patch drivers-base-memoryc-cache-blocks-in-radix-tree-to-accelerate-lookup-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch linux-next-rejects.patch linux-next-fix.patch linux-next-fix-2.patch drivers-block-null_blk_mainc-fix-layout.patch drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch proc-convert-everything-to-struct-proc_ops-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch