mirror of
https://github.com/torvalds/linux.git
synced 2026-05-14 13:43:20 -04:00
Trivial conflict in net/core/filter.c, a locally computed 'sdif' is now an argument to the function. Signed-off-by: David S. Miller <davem@davemloft.net>