Jakub Kicinski 2bd87951de Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_prueth.c

net/mac80211/chan.c
  89884459a0b9 ("wifi: mac80211: fix idle calculation with multi-link")
  87f5500285fb ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")
https://lore.kernel.org/all/20240422105623.7b1fbda2@canb.auug.org.au/

net/unix/garbage.c
  1971d13ffa84 ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().")
  4090fa373f0e ("af_unix: Replace garbage collection algorithm.")

drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/ethernet/ti/icssg/icssg_common.c
  4dcd0e83ea1d ("net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()")
  e2dc7bfd677f ("net: ti: icssg-prueth: Move common functions into a separate file")

No adjacent changes.

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

2024-04-25 12:41:37 -07:00

..

actions.c

openvswitch: reduce stack usage in do_execute_actions

2023-10-01 19:07:22 +01:00

conntrack.c

net: openvswitch: Fix Use-After-Free in ovs_ct_exit

2024-04-24 17:14:24 -07:00

conntrack.h

net/sched: act_api: fix miss set post_ct for ovs after do conntrack in act_ct

2021-03-16 15:22:18 -07:00

datapath.c

genetlink: remove linux/genetlink.h

2024-04-01 21:44:34 -07:00

datapath.h

net/sched: Enable tc skb ext allocation on chain miss only when needed

2022-02-05 10:12:53 +00:00

dp_notify.c

net: openvswitch: use netif_ovs_is_port() instead of opencode

2019-07-08 15:53:25 -07:00

drop.h

net: openvswitch: add misc error drop reasons

2023-08-14 08:01:06 +01:00

flow_netlink.c

ip_tunnel: convert __be16 tunnel flags to bitmaps

2024-04-01 10:49:28 +01:00

flow_netlink.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269

2019-06-05 17:30:29 +02:00

flow_table.c

net: openvswitch: Use struct_size()

2023-10-17 13:56:03 +02:00

flow_table.h

net: openvswitch: Annotate struct mask_array with __counted_by

2023-10-17 13:56:03 +02:00

flow.c

net/sched: cls_api: Support hardware miss to tc action

2023-02-20 16:46:10 -08:00

flow.h

net: openvswitch: reduce cpu_used_mask memory

2023-02-06 22:36:29 -08:00

Kconfig

net: create nf_conntrack_ovs for ovs and tc use

2023-02-10 16:23:03 -08:00

Makefile

openvswitch: add trace points

2021-06-22 10:47:32 -07:00

meter.c

genetlink: remove userhdr from struct genl_info

2023-08-15 14:54:44 -07:00

meter.h

net: openvswitch: remove unnecessary linux/genetlink.h include

2024-04-01 21:44:34 -07:00

openvswitch_trace.c

openvswitch: add trace points

2021-06-22 10:47:32 -07:00

openvswitch_trace.h

openvswitch: add trace points

2021-06-22 10:47:32 -07:00

vport-geneve.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport-gre.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport-internal_dev.c

openvswitch: Change the return type for vport_ops.send function hook to int

2022-09-19 18:28:50 -07:00

vport-internal_dev.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269

2019-06-05 17:30:29 +02:00

vport-netdev.c

net: openvswitch: Release reference to netdev

2024-04-24 17:07:17 -07:00

vport-netdev.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269

2019-06-05 17:30:29 +02:00

vport-vxlan.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport.c

net: openvswitch: fix upcall counter access before allocation

2023-06-07 12:25:05 +01:00

vport.h

net: openvswitch: Add support to count upcall packets

2022-12-09 10:43:46 +00:00