diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-29 09:10:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-29 09:10:54 +0300 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /lib/notifier-error-inject.h | |
| parent | 62e3a931788223048120357ab3f29dcb55c5ef79 (diff) | |
| parent | 60b548237fed4b4164bab13c994dd9615f6c4323 (diff) | |
| download | linux-e561bb29b650d2817d10a4858f1817836ed08399.tar.xz | |
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>
Diffstat (limited to 'lib/notifier-error-inject.h')
0 files changed, 0 insertions, 0 deletions