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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/act_ct.c
  26488172b0 ("net/sched: Fix UAF when resolving a clash")
  3abbd7ed8b ("act_ct: prepare for stolen verdict coming from conntrack and nat engine")

No adjacent changes.

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

2024-07-11 12:58:13 -07:00

..

6lowpan

net: fill in MODULE_DESCRIPTION()s for 6LoWPAN

2024-02-09 14:12:01 -08:00

9p

Merge tag '9p-for-6.10-rc2' of https://github.com/martinetd/linux

2024-05-29 09:25:15 -07:00

802

net: fill in MODULE_DESCRIPTION()s under net/802*

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

8021q

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

appletalk

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

2024-05-09 10:01:01 -07:00

atm

atm: clean up a put_user() calls

2024-06-14 19:08:50 -07:00

ax25

ax25: Replace kfree() in ax25_dev_free() with ax25_dev_put()

2024-06-01 15:49:42 -07:00

batman-adv

Revert "batman-adv: prefer kfree_rcu() over call_rcu() with free-only callbacks"

2024-06-12 20:18:00 +02:00

bluetooth

Bluetooth: L2CAP: Fix deadlock

2024-06-28 14:32:02 -04:00

bpf

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

2024-07-09 17:01:46 +02:00

bridge

netfilter: br_netfilter: Use nested-BH locking for brnf_frag_data_storage.

2024-06-24 16:41:23 -07:00

caif

net: caif: remove unused structs

2024-06-05 10:18:06 +01:00

can

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

2024-06-27 12:14:11 -07:00

ceph

libceph: init the cursor when preparing sparse read in msgr2

2024-03-06 12:43:01 +01:00

core

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

2024-07-11 12:58:13 -07:00

dcb

net: dcb: choose correct policy to parse DCB_ATTR_BCN

2023-08-01 21:07:46 -07:00

dccp

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

2024-06-27 12:14:11 -07:00

devlink

devlink: Constify the 'table_ops' parameter of devl_dpipe_table_register()

2024-06-05 10:24:57 +01:00

dns_resolver

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

2024-01-11 10:07:29 -08:00

dsa

net: dsa: Fix typo in NET_DSA_TAG_RTL4_A Kconfig

2024-06-11 19:24:11 -07:00

ethernet

netkit: Fix pkt_type override upon netkit pass verdict

2024-05-25 10:48:57 -07:00

ethtool

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

2024-07-11 12:58:13 -07:00

handshake

net/handshake: remove redundant assignment to variable ret

2024-04-16 17:14:55 -07:00

hsr

net: hsr: cosmetic: Remove extra white space

2024-06-19 17:32:57 -07:00

ieee802154

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

2024-05-28 07:27:29 -07:00

ife

net: sched: ife: fix potential use-after-free

2023-12-15 10:50:18 +00:00

ipv4

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

2024-07-11 12:58:13 -07:00

ipv6

udp: Remove duplicate included header file trace/events/udp.h

2024-07-09 13:30:25 +02:00

iucv

Merge tag 's390-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2024-05-21 12:09:36 -07:00

kcm

net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function

2024-03-11 09:53:22 +00:00

key

net: fill in MODULE_DESCRIPTION()s for af_key

2024-02-09 14:12:01 -08:00

l2tp

l2tp: fix possible UAF when cleaning up tunnels

2024-07-09 11:06:21 +02:00

l3mdev

…

lapb

…

llc

net: change proto and proto_ops accept type

2024-05-13 18:19:09 -06:00

mac80211

Merge tag 'wireless-next-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

2024-06-27 13:53:43 -07:00

mac802154

net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()

2024-06-03 11:20:56 +02:00

mctp

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

2024-02-29 14:24:56 -08:00

mpls

net: Remove the now superfluous sentinel elements from ctl_table array

2024-05-03 13:29:41 +01:00

mptcp

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

2024-06-13 13:13:46 -07:00

ncsi

net/ncsi: Fix the multi thread manner of NCSI driver

2024-06-01 16:21:44 -07:00

netfilter

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

2024-07-11 12:58:13 -07:00

netlabel

netlabel: fix RCU annotation for IPv4 options on socket creation

2024-05-13 14:58:12 -07:00

netlink

net: netlink: remove the cb_mutex "injection" from netlink core

2024-06-10 13:15:40 +01:00

netrom

netrom: Fix a memory leak in nr_heartbeat_expiry()

2024-06-17 13:06:23 +01:00

nfc

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

2024-05-23 12:49:37 -07:00

nsh

nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().

2024-04-26 12:20:01 +02:00

openvswitch

net: openvswitch: store sampling probability in cb.

2024-07-05 17:45:47 -07:00

packet

af_packet: use sk_skb_reason_drop to free rx packets

2024-06-19 12:44:22 +01:00

phonet

net: change proto and proto_ops accept type

2024-05-13 18:19:09 -06:00

psample

net: psample: allow using rate as probability

2024-07-05 17:45:47 -07:00

qrtr

net: qrtr: ns: Ignore ENODEV failures in ns

2024-06-14 13:17:21 +02:00

rds

rds:Simplify the allocation of slab caches

2024-06-19 10:47:40 +01:00

rfkill

net: rfkill: Correct return value in invalid parameter case

2024-06-26 10:49:01 +02:00

rose

net: change proto and proto_ops accept type

2024-05-13 18:19:09 -06:00

rxrpc

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

2024-05-09 10:01:01 -07:00

sched

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

2024-07-11 12:58:13 -07:00

sctp

sctp: cancel a blocking accept when shutdown a listen socket

2024-07-03 09:45:39 +01:00

smc

net/smc: Introduce IPPROTO_SMC

2024-06-17 13:14:09 +01:00

strparser

…

sunrpc

net, sunrpc: Remap EPERM in case of connection failure in xs_tcp_setup_socket

2024-07-11 12:17:45 +02:00

switchdev

net: bridge: switchdev: Improve error message for port_obj_add/del functions

2024-05-08 12:19:12 +01:00

tipc

tipc: force a dst refcount before doing decryption

2024-06-18 15:08:57 +02:00

tls

net: tls: Pass union tls_crypto_context pointer to memzero_explicit

2024-07-09 11:14:47 -07:00

unix

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

2024-07-04 14:16:11 -07:00

vmw_vsock

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2024-05-23 12:04:36 -07:00

wireless

Merge tag 'wireless-next-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

2024-06-27 13:53:43 -07:00

x25

net: change proto and proto_ops accept type

2024-05-13 18:19:09 -06:00

xdp

net: Move flush list retrieval to where it is used.

2024-07-02 15:26:57 +02:00

xfrm

net: fix __dst_negative_advice() race

2024-05-29 17:34:49 -07:00

compat.c

file: stop exposing receive_fd_user()

2023-12-12 14:24:14 +01:00

devres.c

…

Kconfig

ethtool: provide customized dim profile management

2024-06-25 17:15:06 -07:00

Kconfig.debug

…

Makefile

af_unix: Remove CONFIG_UNIX_SCM.

2024-01-31 16:41:16 -08:00

socket.c

net: have do_accept() take a struct proto_accept_arg argument

2024-05-13 18:19:19 -06:00

sysctl_net.c

sysctl: treewide: constify argument ctl_table_root::permissions(table)

2024-04-24 09:43:54 +02:00