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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/stmicro/stmmac/dwmac5.c
drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
  37e4b8df27bc ("net: stmmac: fix FPE events losing")
  c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/

Adjacent changes:

net/ipv4/tcp_ao.c
  9396c4ee93f9 ("net/tcp: Don't store TCP-AO maclen on reqsk")
  7b0f570f879a ("tcp: Move TCP-AO bits from cookie_v[46]_check() to tcp_ao_syncookie().")

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

2023-12-07 17:53:17 -08:00

..

preload

bpf: make preloaded map iterators to display map elements count

2023-07-06 12:42:25 -07:00

arraymap.c

bpf: Fix prog_array_map_poke_run map poke update

2023-12-06 22:40:16 +01:00

bloom_filter.c

bpf: Centralize permissions checks for all BPF map types

2023-06-19 14:04:04 +02:00

bpf_cgrp_storage.c

bpf: Teach verifier that certain helpers accept NULL pointer.

2023-04-04 16:57:16 -07:00

bpf_inode_storage.c

Networking changes for 6.4.

2023-04-26 16:07:23 -07:00

bpf_iter.c

bpf: Add __bpf_kfunc_{start,end}_defs macros

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

bpf_local_storage.c

bpf: bpf_sk_storage: Fix the missing uncharge in sk_omem_alloc

2023-09-06 11:08:14 +02:00

bpf_lru_list.c

bpf: Address KCSAN report on bpf_lru_list

2023-05-12 12:01:03 -07:00

bpf_lru_list.h

bpf: lru: Remove unused declaration bpf_lru_promote()

2023-08-08 17:21:42 -07:00

bpf_lsm.c

bpf: Fix the kernel crash caused by bpf_setsockopt().

2023-01-26 23:26:40 -08:00

bpf_struct_ops_types.h

bpf: Add dummy BPF STRUCT_OPS for test purpose

2021-11-01 14:10:00 -07:00

bpf_struct_ops.c

bpf: Charge modmem for struct_ops trampoline

2023-09-14 15:30:45 -07:00

bpf_task_storage.c

bpf: Teach verifier that certain helpers accept NULL pointer.

2023-04-04 16:57:16 -07:00

btf.c

bpf: Move GRAPH_{ROOT,NODE}_MASK macros into btf_field_type enum

2023-11-09 19:07:51 -08:00

cgroup_iter.c

bpf: Let verifier consider {task,cgroup} is trusted in bpf_iter_reg

2023-11-07 15:24:25 -08:00

cgroup.c

for-6.7/io_uring-sockopt-2023-10-30

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

core.c

bpf: Fix a verifier bug due to incorrect branch offset comparison with cpu=v4

2023-12-01 15:41:50 -08:00

cpumap.c

net, bpf: Add a warning if NAPI cb missed xdp_do_flush().

2023-10-17 15:02:03 +02:00

cpumask.c

bpf: Add __bpf_kfunc_{start,end}_defs macros

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

devmap.c

net, bpf: Add a warning if NAPI cb missed xdp_do_flush().

2023-10-17 15:02:03 +02:00

disasm.c

bpf: change bpf_alu_sign_string and bpf_movsx_string to static

2023-08-04 16:15:50 -07:00

disasm.h

bpf: Relicense disassembler as GPL-2.0-only OR BSD-2-Clause

2021-09-02 14:49:23 +02:00

dispatcher.c

bpf: Synchronize dispatcher update with bpf_dispatcher_xdp_func

2022-12-14 12:02:14 -08:00

hashtab.c

bpf: Fix unnecessary -EBUSY from htab_lock_bucket

2023-10-24 14:25:55 +02:00

helpers.c

bpf: Add a new kfunc for cgroup1 hierarchy

2023-11-14 08:56:56 -08:00

inode.c

bpf: convert to new timestamp accessors

2023-10-18 14:08:30 +02:00

Kconfig

bpf: Add fd-based tcx multi-prog infra with link support

2023-07-19 10:07:27 -07:00

link_iter.c

bpf: Add bpf_link iterator

2022-05-10 11:20:45 -07:00

local_storage.c

cgroup changes for v6.4-rc1

2023-04-29 10:05:22 -07:00

log.c

bpf: emit frameno for PTR_TO_STACK regs if it differs from current one

2023-11-18 11:39:59 -08:00

lpm_trie.c

bpf, lpm: Fix check prefixlen before walking trie

2023-11-09 19:07:38 -08:00

Makefile

bpf: Add fd-based tcx multi-prog infra with link support

2023-07-19 10:07:27 -07:00

map_in_map.c

bpf: Fix elem_size not being set for inner maps

2023-06-02 16:22:12 -07:00

map_in_map.h

bpf: Add map_meta_equal map ops

2020-08-28 15:41:30 +02:00

map_iter.c

bpf: Add __bpf_kfunc_{start,end}_defs macros

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

memalloc.c

bpf: Add missed allocation hint for bpf_mem_cache_alloc_flags()

2023-11-26 18:00:26 -08:00

mmap_unlock_work.h

bpf: Introduce helper bpf_find_vma

2021-11-07 11:54:51 -08:00

mprog.c

bpf: Handle bpf_mprog_query with NULL entry

2023-10-06 17:11:20 -07:00

net_namespace.c

net: Add includes masked by netdevice.h including uapi/bpf.h

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

offload.c

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

2023-09-21 21:49:45 +02:00

percpu_freelist.c

bpf: Initialize same number of free nodes for each pcpu_freelist

2022-11-11 12:05:14 -08:00

percpu_freelist.h

bpf: Use raw_spin_trylock() for pcpu_freelist_push/pop in NMI

2020-10-06 00:04:11 +02:00

prog_iter.c

bpf: Refactor bpf_iter_reg to have separate seq_info member

2020-07-25 20:16:32 -07:00

queue_stack_maps.c

bpf: Avoid deadlock when using queue and stack maps from NMI

2023-09-11 19:04:49 -07:00

reuseport_array.c

bpf: Centralize permissions checks for all BPF map types

2023-06-19 14:04:04 +02:00

ringbuf.c

bpf: Fold smp_mb__before_atomic() into atomic_set_release()

2023-10-24 14:26:07 +02:00

stackmap.c

bpf: Add crosstask check to __bpf_get_stack

2023-11-10 11:06:10 -08:00

syscall.c

bpf: rename BPF_F_TEST_SANITY_STRICT to BPF_F_TEST_REG_INVARIANTS

2023-11-17 10:30:02 -08:00

sysfs_btf.c

bpf: Load and verify kernel module BTFs

2020-11-10 15:25:53 -08:00

task_iter.c

bpf: bpf_iter_task_next: use next_task(kit->task) rather than next_task(kit->pos)

2023-11-19 11:43:44 -08:00

tcx.c

bpf, tcx: Get rid of tcx_link_const

2023-10-23 15:01:53 -07:00

tnum.c

bpf: generalize reg_set_min_max() to handle non-const register comparisons

2023-11-15 12:03:41 -08:00

trampoline.c

bpf, x64: Fix tailcall infinite loop

2023-09-12 13:06:12 -07:00

verifier.c

bpf: Validate global subprogs lazily

2023-11-24 10:40:06 +01:00