diff options
| author | David S. Miller <[email protected]> | 2018-11-29 06:10:54 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-11-29 06:10:54 +0000 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /net/ipv4/tcp_output.c | |
| parent | net: qualcomm: rmnet: remove set but not used variables 'ip_family, fc_seq, q... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-e561bb29b650d2817d10a4858f1817836ed08399.tar.gz kernel-e561bb29b650d2817d10a4858f1817836ed08399.zip | |
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 <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions