Jakub Kicinski 8f674972d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/intel/iavf/iavf_ethtool.c 3a0b5a2929 ("iavf: Introduce new state machines for flow director") 95260816b4 ("iavf: use iavf_schedule_aq_request() helper") https://lore.kernel.org/all/84e12519-04dc-bd80-bc34-8cf50d7898ce@intel.com/ drivers/net/ethernet/broadcom/bnxt/bnxt.c c13e268c07 ("bnxt_en: Fix HWTSTAMP_FILTER_ALL packet timestamp logic") c2f8063309 ("bnxt_en: Refactor RX VLAN acceleration logic.") a7445d6980 ("bnxt_en: Add support for new RX and TPA_START completion types for P7") 1c7fd6ee2f ("bnxt_en: Rename some macros for the P5 chips") https://lore.kernel.org/all/20231211110022.27926ad9@canb.auug.org.au/ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c bd6781c18c ("bnxt_en: Fix wrong return value check in bnxt_close_nic()") 84793a4995 ("bnxt_en: Skip nic close/open when configuring tstamp filters") https://lore.kernel.org/all/20231214113041.3a0c003c@canb.auug.org.au/ drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c 3d7a3f2612 ("net/mlx5: Nack sync reset request when HotPlug is enabled") cecf44ea1a ("net/mlx5: Allow sync reset flow when BF MGT interface device is present") https://lore.kernel.org/all/20231211110328.76c925af@canb.auug.org.au/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-12-14 17:14:41 -08:00
..
act_api.c	net/sched: act_api: skip idr replace on bound actions	2023-12-13 17:53:59 -08:00
act_bpf.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
act_connmark.c	net/sched: act_connmark: handle errno on tcf_idr_check_alloc	2023-03-01 08:19:09 +00:00
act_csum.c	net: skbuff: hide csum_not_inet when CONFIG_IP_SCTP not set	2023-04-19 13:04:30 +01:00
act_ct.c	net/sched: act_ct: Take per-cb reference to tcf_ct_flow_table	2023-12-11 09:59:58 +00:00
act_ctinfo.c	net/sched: act_ctinfo: use percpu stats	2023-02-13 20:09:01 -08:00
act_gact.c	Networking changes for 6.2.	2022-12-13 15:47:48 -08:00
act_gate.c	net: sched: Fill in MODULE_DESCRIPTION for act_gate	2023-11-01 21:49:08 -07:00
act_ife.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
act_ipt.c	net/sched: act_ipt: zero skb->cb before calling target	2023-06-29 12:10:37 +02:00
act_meta_mark.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_meta_skbprio.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_meta_skbtcindex.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
act_mirred.c	net/sched: act_mirred: Add carrier check	2023-05-01 07:26:10 +01:00
act_mpls.c	net/sched: remove two skb_mac_header() uses	2023-03-22 22:43:23 -07:00
act_nat.c	net/sched: act_nat: transition to percpu stats and rcu	2023-02-16 10:39:28 +01:00
act_pedit.c	net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX	2023-07-04 10:31:38 +02:00
act_police.c	net: move gso declarations and functions to their own files	2023-06-10 00:11:41 -07:00
act_sample.c	net/sched: act_sample: fix action bind logic	2023-02-26 18:27:45 +00:00
act_simple.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
act_skbedit.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
act_skbmod.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
act_tunnel_key.c	net/sched: act_tunnel_key: add support for "don't fragment"	2023-03-30 23:24:24 -07:00
act_vlan.c	net/sched: avoid indirect act functions on retpoline kernels	2022-12-09 09:18:07 +00:00
cls_api.c	net/sched: act_api: skip idr replace on bound actions	2023-12-13 17:53:59 -08:00
cls_basic.c	net: sched: Fill in missing MODULE_DESCRIPTION for classifiers	2023-11-01 21:49:09 -07:00
cls_bpf.c	net: sched: cls_bpf: Undo tcf_bind_filter in case of an error	2023-07-17 07:33:39 +01:00
cls_cgroup.c	net: sched: Fill in missing MODULE_DESCRIPTION for classifiers	2023-11-01 21:49:09 -07:00
cls_flow.c	treewide: Convert del_timer*() to timer_shutdown*()	2022-12-25 13:38:09 -08:00
cls_flower.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-03 14:34:37 -07:00
cls_fw.c	net: sched: Fill in missing MODULE_DESCRIPTION for classifiers	2023-11-01 21:49:09 -07:00
cls_matchall.c	net: sched: cls_matchall: Undo tcf_bind_filter in case of failure after mall_set_parms	2023-07-17 07:33:38 +01:00
cls_route.c	net: sched: Fill in missing MODULE_DESCRIPTION for classifiers	2023-11-01 21:49:09 -07:00
cls_u32.c	net/sched: cls_u32: replace int refcounts with proper refcounts	2023-11-18 19:38:23 -08:00
em_canid.c	net: sched: kerneldoc fixes	2020-07-13 17:20:40 -07:00
em_cmp.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
em_ipset.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_ipt.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_meta.c	net: implement lockless SO_PRIORITY	2023-10-01 19:09:54 +01:00
em_nbyte.c	net: sched: Return the correct errno code	2021-02-06 11:15:28 -08:00
em_text.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
em_u32.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ematch.c	net_sched: reject TCF_EM_SIMPLE case for complex ematch module	2022-12-19 09:43:18 +00:00
Kconfig	bpf: Add fd-based tcx multi-prog infra with link support	2023-07-19 10:07:27 -07:00
Makefile	net/sched: Retire rsvp classifier	2023-02-16 09:27:07 +01:00
sch_api.c	net/sched: fix a qdisc modification with ambiguous command request	2023-08-23 09:44:48 +01:00
sch_blackhole.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_cake.c	net: move gso declarations and functions to their own files	2023-06-10 00:11:41 -07:00
sch_cbs.c	net/sched: cbs: Use units.h instead of the copy of a definition	2023-11-30 23:15:48 -08:00
sch_choke.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_codel.c	net: sched: remove redundant NULL check in change hook function	2022-09-01 08:06:45 +02:00
sch_drr.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_etf.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_ets.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_fifo.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_fq_codel.c	Revert "net: sched: fq_codel: remove redundant resource cleanup in fq_codel_init()"	2022-10-19 13:47:09 +01:00
sch_fq_pie.c	netlink: make range pointers in policies const	2023-10-26 16:24:09 -07:00
sch_fq.c	net_sched: sch_fq: better validate TCA_FQ_WEIGHTS and TCA_FQ_PRIOMAP	2023-11-08 18:30:21 -08:00
sch_frag.c	net: dst: remove unnecessary input parameter in dst_alloc and dst_init	2023-09-12 11:42:25 +02:00
sch_generic.c	net: don't dump stack on queue timeout	2023-11-15 10:25:12 +00:00
sch_gred.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_hfsc.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_hhf.c	net: sched: remove redundant NULL check in change hook function	2022-09-01 08:06:45 +02:00
sch_htb.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_ingress.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_mq.c	net: sched: add rcu annotations around qdisc->qdisc_sleeping	2023-06-07 10:25:39 +01:00
sch_mqprio_lib.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_mqprio_lib.h	net/sched: mqprio: allow per-TC user input of FP adminStatus	2023-04-13 22:22:10 -07:00
sch_mqprio.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_multiq.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_netem.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_pie.c	net: sched: add rcu annotations around qdisc->qdisc_sleeping	2023-06-07 10:25:39 +01:00
sch_plug.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_prio.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_qfq.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_red.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_sfb.c	Networking fixes for 6.1-rc2, including fixes from netfilter	2022-10-20 17:24:59 -07:00
sch_sfq.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_skbprio.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_taprio.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_tbf.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00
sch_teql.c	net: sched: Fill in missing MODULE_DESCRIPTION for qdiscs	2023-11-01 21:49:09 -07:00