GitLab

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>