Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>