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
..
dpll_core.c	dpll: allocate pin ids in cycle	2023-12-13 18:30:31 -08:00
dpll_core.h
dpll_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-14 17:14:41 -08:00
dpll_netlink.h	dpll: netlink: Add DPLL framework base functions	2023-09-17 11:50:20 +01:00
dpll_nl.c	dpll: spec: add support for pin-dpll signal phase offset/adjust	2023-10-15 16:08:24 +01:00
dpll_nl.h	dpll: spec: add support for pin-dpll signal phase offset/adjust	2023-10-15 16:08:24 +01:00
Kconfig
Makefile