Jakub Kicinski a6ec08beec Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
  165f87691a89 ("bnxt_en: add timestamping statistics support")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-06-20 13:49:59 -07:00

..

bpf.h

bpf: Invert the dependency between bpf-netns.h and netns/bpf.h

2021-12-29 20:03:05 -08:00

can.h

net: add missing includes and forward declarations under net/

2022-07-22 12:53:22 +01:00

conntrack.h

netfilter: conntrack: switch connlabels to atomic_t

2023-10-24 13:16:30 +02:00

core.h

net: Namespace-ify sysctl_optmem_max

2023-12-15 11:01:27 +00:00

flow_table.h

netfilter: nf_flow_table: count pending offload workqueue tasks

2022-07-11 16:25:14 +02:00

generic.h

netns: Replace zero-length array with DECLARE_FLEX_ARRAY() helper

2022-09-28 18:51:47 -07:00

hash.h

netns: provide pure entropy for net_hash_mix()

2019-03-28 17:00:45 -07:00

ieee802154_6lowpan.h

net: dynamically allocate fqdir structures

2019-05-26 14:08:05 -07:00

ipv4.h

net: ipv4: Add a sysctl to set multipath hash seed

2024-06-12 16:42:11 -07:00

ipv6.h

net/ipv6: convert skip_notify_on_dev_down sysctl to u8

2023-06-02 22:55:43 -07:00

mctp.h

net: add missing includes and forward declarations under net/

2022-07-22 12:53:22 +01:00

mib.h

net: reorganize fields in netns_mib

2021-04-02 14:31:44 -07:00

mpls.h

net: add missing includes and forward declarations under net/

2022-07-22 12:53:22 +01:00

netfilter.h

netfilter: move the sysctl nf_hooks_lwtunnel into the netfilter core

2024-06-19 18:41:59 +02:00

nexthop.h

net: add missing includes and forward declarations under net/

2022-07-22 12:53:22 +01:00

nftables.h

net: Remove leftover include from nftables.h

2023-08-13 14:55:25 +01:00

packet.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sctp.h

sctp: add dif and sdif check in asoc and ep lookup

2022-11-18 11:42:54 +00:00

smc.h

net/smc: add sysctl for max conns per lgr for SMC-R v2.1

2023-11-24 12:13:14 +00:00

unix.h

net: add missing includes and forward declarations under net/

2022-07-22 12:53:22 +01:00

xdp.h

net: xsk: Don't include <linux/rculist.h>

2022-12-06 20:04:34 -08:00

xfrm.h

xfrm: fix a data-race in xfrm_gen_index()

2023-09-13 09:20:28 +02:00