1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/cisco/enic
Jakub Kicinski fecc51559a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/udp.c
  f796feabb9 ("udp: add local "peek offset enabled" flag")
  56667da739 ("net: implement lockless setsockopt(SO_PEEK_OFF)")

Adjacent changes:

net/unix/garbage.c
  aa82ac51d6 ("af_unix: Drop oob_skb ref before purging queue in GC.")
  11498715f2 ("af_unix: Remove io_uring code for GC.")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-02-22 15:29:26 -08:00
..
cq_desc.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
cq_enet_desc.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic.h enic: define constants for legacy interrupts offset 2022-10-18 19:34:28 -07:00
enic_api.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_api.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_clsf.c drivers: net: Remove unnecessary semicolon 2019-03-01 23:13:49 -08:00
enic_clsf.h treewide: setup_timer() -> timer_setup() (2 field) 2017-11-21 15:57:09 -08:00
enic_dev.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_dev.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_ethtool.c net: ethtool: pass a pointer to parameters to get/set_rxfh ethtool ops 2023-12-13 22:07:16 -08:00
enic_main.c net: remove stale mentions of dev_base_lock in comments 2024-02-14 11:20:13 +00:00
enic_pp.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_pp.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_res.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
enic_res.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
rq_enet_desc.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_cq.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_cq.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_dev.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_dev.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_devcmd.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_enet.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_intr.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_intr.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_nic.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_resource.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_rq.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_rq.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_rss.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_stats.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_vic.c enic: Avoid false positive under FORTIFY_SOURCE 2024-02-19 10:57:27 +00:00
vnic_vic.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_wq.c treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
vnic_wq.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00
wq_enet_desc.h treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) 2022-06-10 14:51:36 +02:00