Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/net/inet_sock.h f866fbc842 ("ipv4: fix data-races around inet->inet_id") c274af2242 ("inet: introduce inet->inet_flags") https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/ Adjacent changes: drivers/net/bonding/bond_alb.c e74216b8de ("bonding: fix macvlan over alb bond support") f11e5bd159 ("bonding: support balance-alb with openvswitch") drivers/net/ethernet/broadcom/bgmac.c d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()") 23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()") drivers/net/ethernet/broadcom/genet/bcmmii.c 32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()") acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()") net/sctp/socket.c f866fbc842 ("ipv4: fix data-races around inet->inet_id") b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-24 10:51:39 -07:00
..
ipv4
ipv6
br_netfilter.h
nf_bpf_link.h
nf_conntrack_acct.h	netfilter: conntrack: Remove unused function declarations	2023-08-08 13:02:00 +02:00
nf_conntrack_act_ct.h
nf_conntrack_bpf.h
nf_conntrack_bridge.h
nf_conntrack_core.h
nf_conntrack_count.h
nf_conntrack_ecache.h
nf_conntrack_expect.h	netfilter: allow exp not to be removed in nf_ct_find_expectation	2023-07-20 10:06:36 +02:00
nf_conntrack_extend.h
nf_conntrack_helper.h	netfilter: helper: Remove unused function declarations	2023-08-08 13:01:59 +02:00
nf_conntrack_l4proto.h
nf_conntrack_labels.h	netfilter: conntrack: Remove unused function declarations	2023-08-08 13:02:00 +02:00
nf_conntrack_seqadj.h
nf_conntrack_synproxy.h
nf_conntrack_timeout.h
nf_conntrack_timestamp.h
nf_conntrack_tuple.h	netfilter: conntrack: don't fold port numbers into addresses before hashing	2023-07-05 14:42:16 +02:00
nf_conntrack_zones.h
nf_conntrack.h	netfilter: conntrack: Remove unused function declarations	2023-08-08 13:02:00 +02:00
nf_dup_netdev.h
nf_flow_table.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-06-15 22:19:41 -07:00
nf_hooks_lwtunnel.h
nf_log.h
nf_nat_helper.h
nf_nat_masquerade.h
nf_nat_redirect.h
nf_nat.h
nf_queue.h
nf_reject.h
nf_socket.h
nf_synproxy.h
nf_tables_core.h
nf_tables_ipv4.h
nf_tables_ipv6.h
nf_tables_offload.h
nf_tables.h	netfilter: nf_tables: defer gc run if previous batch is still pending	2023-08-23 16:12:59 +02:00
nf_tproxy.h
nft_fib.h
nft_meta.h
nft_reject.h
xt_rateest.h