summaryrefslogtreecommitdiff
path: root/net/netfilter/nf_conntrack_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-10-26 21:28:40 +0300
committerDavid S. Miller <davem@davemloft.net>2019-10-26 21:28:40 +0300
commit64fe8e97693e009501c143a30cc8a28babd4d2b0 (patch)
tree653161b3b365ba0b7d9e99e12f4db4db0dbf8144 /net/netfilter/nf_conntrack_core.c
parent0629d2456ae3bfb374fdc686abb30b73294e4f99 (diff)
parent7873ee26b10bcb03553b6a26ec16b9a937a5b916 (diff)
downloadlinux-64fe8e97693e009501c143a30cc8a28babd4d2b0.tar.xz
Merge branch 'net-aquantia-ptp-followup-fixes'
Igor Russkikh says: ==================== net: aquantia: ptp followup fixes Here are two sparse warnings, third patch is a fix for scaled_ppm_to_ppb missing. Eventually I reworked this to exclude ptp module from build. Please consider it instead of this patch: https://patchwork.ozlabs.org/patch/1184171/ ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
0 files changed, 0 insertions, 0 deletions