![]() The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
actions.c | ||
conntrack.c | ||
conntrack.h | ||
datapath.c | ||
datapath.h | ||
dp_notify.c | ||
flow.c | ||
flow.h | ||
flow_netlink.c | ||
flow_netlink.h | ||
flow_table.c | ||
flow_table.h | ||
Kconfig | ||
Makefile | ||
vport-geneve.c | ||
vport-gre.c | ||
vport-internal_dev.c | ||
vport-internal_dev.h | ||
vport-netdev.c | ||
vport-netdev.h | ||
vport-vxlan.c | ||
vport.c | ||
vport.h |