Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflicts with conntrack template fixes. Conflicts: net/netfilter/nf_conntrack_core.c net/netfilter/nf_synproxy_core.c net/netfilter/xt_CT.c Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2026-10-16 22:39:48 +00:00 · 2015-08-21 01:10:19 +02:00 · 2015-08-21 01:10:19 +02:00 · 81bf1c64e7
commit 81bf1c64e7
parent 8cfd23e674 938049e18d
855 changed files with 24295 additions and 7762 deletions
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/linux/average.h
+++ b/include/linux/average.h
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/property.h
+++ b/include/linux/property.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
--- a/include/net/flow.h
+++ b/include/net/flow.h
--- a/include/net/gre.h
+++ b/include/net/gre.h
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
--- a/include/net/vrf.h
+++ b/include/net/vrf.h
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
--- a/include/uapi/linux/ila.h
+++ b/include/uapi/linux/ila.h
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
--- a/include/uapi/linux/lwtunnel.h
+++ b/include/uapi/linux/lwtunnel.h
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h