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

include/net/sock.h
  7b50ecfcc6 ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0db ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f6 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

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

2021-10-28 10:43:58 -07:00

..

preload

libbpf: Make libbpf_version.h non-auto-generated

2021-09-13 15:36:47 -07:00

arraymap.c

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

2021-10-28 10:43:58 -07:00

bpf_inode_storage.c

bpf: Fix spelling mistakes

2021-05-24 21:13:05 -07:00

bpf_iter.c

bpf: Refactor BPF_PROG_RUN into a function

2021-08-17 00:45:07 +02:00

bpf_local_storage.c

…

bpf_lru_list.c

…

bpf_lru_list.h

…

bpf_lsm.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2021-06-17 11:54:56 -07:00

bpf_struct_ops_types.h

…

bpf_struct_ops.c

bpf: Handle return value of BPF_PROG_TYPE_STRUCT_OPS prog

2021-09-14 11:09:50 -07:00

bpf_task_storage.c

bpf: Consolidate task_struct BTF_ID declarations

2021-08-25 10:37:05 -07:00

btf.c

bpf: Support for new btf kind BTF_KIND_TAG

2021-09-14 18:45:52 -07:00

cgroup.c

bpf: Migrate cgroup_bpf to internal cgroup_bpf_attach_type enum

2021-08-23 17:50:24 -07:00

core.c

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

2021-10-28 10:43:58 -07:00

cpumap.c

bpf: cpumap: Implement generic cpumap

2021-07-07 20:01:45 -07:00

devmap.c

bpf, devmap: Exclude XDP broadcast to master device

2021-08-09 23:25:14 +02:00

disasm.c

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

2021-09-02 14:49:23 +02: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

…

hashtab.c

bpf: Replace callers of BPF_CAST_CALL with proper function typedef

2021-09-28 16:27:18 -07:00

helpers.c

bpf: Replace callers of BPF_CAST_CALL with proper function typedef

2021-09-28 16:27:18 -07:00

inode.c

bpf: Fix regression on BPF_OBJ_GET with non-O_RDWR flags

2021-06-22 14:57:43 +02:00

Kconfig

sock_map: Relax config dependency to CONFIG_NET

2021-07-15 18:17:49 -07:00

local_storage.c

bpf: Increase supported cgroup storage value size

2021-07-27 15:59:29 -07:00

lpm_trie.c

bpf: Allow RCU-protected lookups to happen from bh context

2021-06-24 19:41:15 +02:00

Makefile

…

map_in_map.c

bpf: Remember BTF of inner maps.

2021-07-15 22:31:10 +02:00

map_in_map.h

…

map_iter.c

…

net_namespace.c

…

offload.c

…

percpu_freelist.c

…

percpu_freelist.h

…

prog_iter.c

…

queue_stack_maps.c

…

reuseport_array.c

bpf: Fix spelling mistakes

2021-05-24 21:13:05 -07:00

ringbuf.c

bpf: Fix false positive kmemleak report in bpf_ringbuf_area_alloc()

2021-06-28 15:57:46 +02:00

stackmap.c

bpf: Fix integer overflow in prealloc_elems_and_freelist()

2021-09-30 16:17:23 +02:00

syscall.c

bpf: Fix potential race in tail call compatibility check

2021-10-26 12:37:28 -07:00

sysfs_btf.c

…

task_iter.c

bpf: Consolidate task_struct BTF_ID declarations

2021-08-25 10:37:05 -07:00

tnum.c

bpf, tnums: Provably sound, faster, and more precise algorithm for tnum_mul

2021-06-01 13:34:15 +02:00

trampoline.c

bpf: Introduce helper bpf_get_branch_snapshot

2021-09-13 10:53:50 -07:00

verifier.c

bpf: Replace "want address" users of BPF_CAST_CALL with BPF_CALL_IMM

2021-09-28 16:27:18 -07:00