| commit | e561bb29b650d2817d10a4858f1817836ed08399 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Nov 28 22:10:54 2018 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Wed Nov 28 22:10:54 2018 -0800 |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 | |
| parent | 62e3a931788223048120357ab3f29dcb55c5ef79 [diff] | |
| parent | 60b548237fed4b4164bab13c994dd9615f6c4323 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>