From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Jan 2023 13:13:09 +0000 (+0000)
Subject: Merge branch 'enetc-mac-merge-prep'
X-Git-Tag: v6.6-pxa1908~1869^2~233
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7a98143118799411cc09e3dfc0b2a6f12628f7db;p=linux.git

Merge branch 'enetc-mac-merge-prep'

Vladimir Oltean says:

====================
ENETC MAC Merge cleanup

This is a preparatory patch set for MAC Merge layer support in enetc via
ethtool. It does the following:

- consolidates a software lockstep register write procedure for the pMAC
- detects per-port frame preemption capability and only writes pMAC
  registers if a pMAC exists
- stops enabling the pMAC by default

Additionally, I noticed some build warnings in the driver which are new
in this kernel version, so patch 1/6 fixes those.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

7a98143118799411cc09e3dfc0b2a6f12628f7db