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
..
acpi	ACPI: PM: Add acpi_device_fix_up_power_children() function	2023-11-20 17:31:49 +01:00
asm-generic	asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation	2023-11-22 09:32:49 -08:00
clocksource
crypto	crypto: FIPS 202 SHA-3 register in hash info for IMA	2023-10-27 18:04:30 +08:00
drm	Merge tag 'drm-misc-fixes-2023-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes	2023-12-08 12:16:11 +10:00
dt-bindings	linux-watchdog 6.7-rc1 tag	2023-11-09 13:54:25 -08:00
keys
kunit
kvm	KVM/arm64 updates for 6.7	2023-10-31 16:37:07 -04:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-14 17:14:41 -08:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-14 17:14:41 -08:00
pcmcia
ras
rdma	RDMA/core: Fix umem iterator when PAGE_SIZE is greater then HCA pgsz	2023-12-04 20:02:41 -04:00
rv
scsi	scsi: sd: Fix system start for ATA devices	2023-11-24 20:44:21 -05:00
soc	IOMMU Updates for Linux v6.7	2023-11-09 13:37:28 -08:00
sound	ALSA: cs35l41: Fix for old systems which do not support command	2023-11-20 12:37:01 +01:00
target
trace	rxrpc: Fix RTT determination to use any ACK as a source	2023-11-17 02:50:33 +00:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-14 17:14:41 -08:00
ufs
vdso
video	fbdev: stifb: Make the STI next font pointer a 32-bit signed offset	2023-10-30 14:54:41 +01:00
xen	xen/events: reduce externally visible helper functions	2023-11-14 09:29:28 +01:00