From: Paolo Abeni Date: Tue, 30 Jan 2024 10:49:06 +0000 (+0100) Subject: Merge branch 'ice-fix-timestamping-in-reset-process' X-Git-Tag: block-6.9-20240315~27^2~408 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e8166eb24692ddac08ed3a401d3d09e9b4443642;p=linux-2.6-block.git Merge branch 'ice-fix-timestamping-in-reset-process' Tony Nguyen says: ==================== ice: fix timestamping in reset process Karol Kolacinski says: PTP reset process has multiple places where timestamping can end up in an incorrect state. This series introduces a proper state machine for PTP and refactors a large part of the code to ensure that timestamping does not break. The following are changes since commit 91374ba537bd60caa9ae052c9f1c0fe055b39149: net: dsa: mt7530: support OF-based registration of switch MDIO bus and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 100GbE ==================== Link: https://lore.kernel.org/r/20240125215757.2601799-1-anthony.l.nguyen@intel.com Signed-off-by: Paolo Abeni --- e8166eb24692ddac08ed3a401d3d09e9b4443642