Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>