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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  c9663f79cd ("ice: adjust switchdev rebuild path")
  7758017911 ("ice: restore timestamp configuration after device reset")
https://lore.kernel.org/all/20231121211259.3348630-1-anthony.l.nguyen@intel.com/

Adjacent changes:

kernel/bpf/verifier.c
  bb124da69c ("bpf: keep track of max number of bpf_loop callback iterations")
  5f99f312bd ("bpf: add register bounds sanity checks and sanitization")

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

2023-11-23 12:20:58 -08:00

..

bpf_sk_storage.c

bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsing

2023-07-27 10:07:56 -07:00

datagram.c

iov_iter, net: Move hash_and_copy_to_iter() to net/

2023-10-09 09:35:14 +02:00

dev_addr_lists_test.c

net: fill in MODULE_DESCRIPTION()s under net/core

2023-10-28 11:29:27 +01:00

dev_addr_lists.c

net: extract a few internals from netdevice.h

2022-04-07 20:32:09 -07:00

dev_ioctl.c

net: partial revert of the "Make timestamping selectable: series

2023-11-18 18:42:37 -08:00

dev.c

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

2023-11-23 12:20:58 -08:00

dev.h

Merge tag 'for-netdev' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2023-10-26 20:02:41 -07:00

drop_monitor.c

net: extend drop reasons for multiple subsystems

2023-04-20 20:20:49 -07:00

dst_cache.c

wireguard: device: reset peer src endpoint when netns exits

2021-11-29 19:50:45 -08:00

dst.c

net: dst: remove unnecessary input parameter in dst_alloc and dst_init

2023-09-12 11:42:25 +02:00

failover.c

net: failover: use IFF_NO_ADDRCONF flag to prevent ipv6 addrconf

2022-12-12 15:18:25 -08:00

fib_notifier.c

net: fib_notifier: propagate extack down to the notifier block callback

2019-10-04 11:10:56 -07:00

fib_rules.c

fib: expand fib_rule_policy

2021-12-16 07:18:35 -08:00

filter.c

bpf, netkit: Add indirect call wrapper for fetching peer dev

2023-11-20 10:15:16 -08:00

flow_dissector.c

net/core: Fix ETH_P_1588 flow dissector

2023-09-15 10:40:04 +01:00

flow_offload.c

tc: flower: Enable offload support IPSEC SPI field.

2023-08-02 10:09:32 +01:00

gen_estimator.c

treewide: Convert del_timer*() to timer_shutdown*()

2022-12-25 13:38:09 -08:00

gen_stats.c

net: Remove the obsolte u64_stats_fetch_*_irq() users (net).

2022-10-28 20:13:54 -07:00

gro_cells.c

net: drop the weight argument from netif_napi_add

2022-09-28 18:57:14 -07:00

gro.c

gro: move the tc_ext comparison to a helper

2023-06-18 18:08:35 +01:00

gso_test.c

net: gso_test: support CONFIG_MAX_SKB_FRAGS up to 45

2023-11-13 11:04:38 +00:00

gso.c

net: move gso declarations and functions to their own files

2023-06-10 00:11:41 -07:00

hwbm.c

net: hwbm: Make the hwbm_pool lock a mutex

2019-06-09 19:40:10 -07:00

link_watch.c

net: linkwatch: only report IF_OPER_LOWERLAYERDOWN if iflink is actually down

2022-11-16 09:45:00 +00:00

lwt_bpf.c

lwt: Fix return values of BPF xmit ops

2023-08-18 16:05:26 +02:00

lwtunnel.c

xfrm: lwtunnel: squelch kernel warning in case XFRM encap type is not available

2022-10-12 10:45:51 +02:00

Makefile

net: add skb_segment kunit test

2023-10-11 10:39:01 +01:00

neighbour.c

neighbour: fix various data-races

2023-10-20 17:41:29 -07:00

net_namespace.c

lib/ref_tracker: improve printing stats

2023-06-05 15:28:42 -07:00

net-procfs.c

net-sysfs: display two backlog queue len separately

2023-03-22 12:03:52 +01:00

net-sysfs.c

net: move struct netdev_rx_queue out of netdevice.h

2023-08-03 08:38:07 -07:00

net-sysfs.h

net-sysfs: add netdev_change_owner()

2020-02-26 20:07:25 -08:00

net-traces.c

udp6: add a missing call into udp_fail_queue_rcv_skb tracepoint

2023-07-07 09:16:52 +01:00

netclassid_cgroup.c

cgroup, netclassid: on modifying netclassid in cgroup, only consider the main process.

2023-10-16 16:36:53 -07:00

netdev-genl-gen.c

net: ynl: prefix uAPI header include with uapi/

2023-05-26 10:30:14 +01:00

netdev-genl-gen.h

net: ynl: prefix uAPI header include with uapi/

2023-05-26 10:30:14 +01:00

netdev-genl.c

bpf: expose information about supported xdp metadata kfunc

2023-09-15 11:26:58 -07:00

netevent.c

net: core: Correct function name netevent_unregister_notifier() in the kerneldoc

2021-03-28 17:56:56 -07:00

netpoll.c

netpoll: allocate netdev tracker right away

2023-06-15 08:21:11 +01:00

netprio_cgroup.c

bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode

2021-09-13 16:35:58 -07:00

of_net.c

net: Explicitly include correct DT includes

2023-07-27 20:33:16 -07:00

page_pool.c

net: page_pool: avoid touching slow on the fastpath

2023-11-21 17:22:30 -08:00

pktgen.c

Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-11-02 20:53:31 -10:00

ptp_classifier.c

ptp: Add generic PTP is_sync() function

2022-03-07 11:31:34 +00:00

request_sock.c

tcp: add rcu protection around tp->fastopen_rsk

2019-10-13 10:13:08 -07:00

rtnetlink.c

rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink

2023-11-18 20:18:25 -08:00

scm.c

net: annotate data-races around sock->ops

2023-08-09 15:32:43 -07:00

secure_seq.c

tcp: Fix data-races around sysctl knobs related to SYN option.

2022-07-20 10:14:49 +01:00

selftests.c

net: fill in MODULE_DESCRIPTION()s under net/core

2023-10-28 11:29:27 +01:00

skbuff.c

Merge tag 'net-next-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2023-10-31 05:10:11 -10:00

skmsg.c

bpf, sockmap: Fix skb refcnt race after locking changes

2023-09-04 09:53:35 +02:00

sock_destructor.h

skb_expand_head() adjust skb->truesize incorrectly

2021-10-22 12:35:51 -07:00

sock_diag.c

net: fix __sock_gen_cookie()

2022-11-21 20:36:30 -08:00

sock_map.c

bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets

2023-09-29 17:11:07 +02:00

sock_reuseport.c

soreuseport: Fix socket selection for SO_INCOMING_CPU.

2022-10-25 11:35:16 +02:00

sock.c

Merge tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux

2023-11-01 11:16:34 -10:00

stream.c

tcp: allow again tcp_disconnect() when threads are waiting

2023-10-13 16:49:32 -07:00

sysctl_net_core.c

networking: Update to register_net_sysctl_sz

2023-08-15 15:26:18 -07:00

timestamping.c

net: partial revert of the "Make timestamping selectable: series

2023-11-18 18:42:37 -08:00

tso.c

net: tso: inline tso_count_descs()

2022-12-12 15:04:39 -08:00

utils.c

net: core: inet[46]_pton strlen len types

2022-11-01 21:14:39 -07:00

xdp.c

bpf: Add __bpf_kfunc_{start,end}_defs macros

2023-11-01 22:33:53 -07:00