Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/net/inet_sock.h f866fbc842 ("ipv4: fix data-races around inet->inet_id") c274af2242 ("inet: introduce inet->inet_flags") https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/ Adjacent changes: drivers/net/bonding/bond_alb.c e74216b8de ("bonding: fix macvlan over alb bond support") f11e5bd159 ("bonding: support balance-alb with openvswitch") drivers/net/ethernet/broadcom/bgmac.c d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()") 23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()") drivers/net/ethernet/broadcom/genet/bcmmii.c 32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()") acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()") net/sctp/socket.c f866fbc842 ("ipv4: fix data-races around inet->inet_id") b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-24 10:51:39 -07:00
..
associola.c	sctp: delete the nested flexible array peer_init	2023-04-21 08:19:30 +01:00
auth.c	sctp: delete the nested flexible array hmac	2023-04-21 08:19:30 +01:00
bind_addr.c	sctp: fail if no bound addresses can be used for a given scope	2023-01-24 18:32:33 -08:00
chunk.c	net: sctp: chunk.c: delete duplicated word	2020-08-24 16:21:43 -07:00
debug.c	sctp: add the probe timer in transport for PLPMTUD	2021-06-22 11:28:52 -07:00
diag.c	sctp: sctp_sock_filter(): avoid list_entry() on possibly empty list	2023-02-10 19:28:29 -08:00
endpointola.c	sctp: add dif and sdif check in asoc and ep lookup	2022-11-18 11:42:54 +00:00
input.c	inet: move inet->recverr to inet->inet_flags	2023-08-16 11:09:17 +01:00
inqueue.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
ipv6.c	net: annotate lockless accesses to sk->sk_err_soft	2023-03-17 08:25:05 +00:00
Kconfig	sctp: create udp4 sock and add its encap_rcv	2020-10-30 15:23:52 -07:00
Makefile	sctp: add fair capacity stream scheduler	2023-03-09 11:31:44 +01:00
objcnt.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
offload.c	net: move gso declarations and functions to their own files	2023-06-10 00:11:41 -07:00
output.c	net: allow gso_max_size to exceed 65536	2022-05-16 10:18:55 +01:00
outqueue.c	sctp: delete the nested flexible array variable	2023-04-21 08:19:29 +01:00
primitive.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
proc.c	sctp: move hlist_node and hashent out of sctp_ep_common	2021-12-23 11:15:30 +00:00
protocol.c	inet: move inet->freebind to inet->inet_flags	2023-08-16 11:09:17 +01:00
sm_make_chunk.c	sctp: delete the nested flexible array peer_init	2023-04-21 08:19:30 +01:00
sm_sideeffect.c	sctp: handle invalid error codes without calling BUG()	2023-06-12 09:36:27 +01:00
sm_statefuns.c	sctp: fix an error code in sctp_sf_eat_auth()	2023-06-12 09:36:27 +01:00
sm_statetable.c	sctp: add the probe timer in transport for PLPMTUD	2021-06-22 11:28:52 -07:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-24 10:51:39 -07:00
stream_interleave.c	sctp: delete the nested flexible array skip	2023-04-21 08:19:29 +01:00
stream_sched_fc.c	sctp: add weighted fair queueing stream scheduler	2023-03-09 11:31:44 +01:00
stream_sched_prio.c	sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop	2023-02-23 12:59:40 -08:00
stream_sched_rr.c	sctp: delete free member from struct sctp_sched_ops	2022-12-01 20:14:23 -08:00
stream_sched.c	sctp: fix a potential OOB access in sctp_sched_set_sched()	2023-05-10 12:10:15 +01:00
stream.c	sctp: delete the nested flexible array params	2023-04-21 08:19:29 +01:00
sysctl.c	sctp: sysctl: make extra pointers netns aware	2022-12-12 12:57:29 -08:00
transport.c	sctp: fix an issue that plpmtu can never go to complete state	2023-05-22 11:05:20 +01:00
tsnmap.c	net: sctp: trivial: fix typo in comment	2021-03-04 13:48:32 -08:00
ulpevent.c	net: remove noblock parameter from recvmsg() entities	2022-04-12 15:00:25 +02:00
ulpqueue.c	sctp: remove unnecessary NULL check in sctp_ulpq_tail_event()	2022-10-20 21:43:10 -07:00