Merge branch 'net-make-timestamping-selectable'

First part of "net: Make timestamping selectable" from Kory Maincent.
Change the driver-facing type already to lower rebasing pain.

Link: https://lore.kernel.org/20240709-feature_ptp_netnext-v17-0-b5317f50df2a@bootlin.com/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_ethtool.c
Simple merge

diff --cc include/linux/ethtool.h
Simple merge

diff --cc include/net/dsa.h
Simple merge

diff --cc net/ethtool/common.c
Simple merge

diff --cc net/ethtool/common.h
index b55705a9ad5aa014cf2a888bd6c0c9e922d7608e,b9daeecbd84dfe5ec630b2e3a6479628ff6c0283..863806fcf01ae6d04fada8adec91276853ec62e6
--- 1/net/ethtool/common.h
--- 2/net/ethtool/common.h
+++ b/net/ethtool/common.h
@@@ -42,9 -42,9 +42,9 @@@ int __ethtool_get_link(struct net_devic
  bool convert_legacy_settings_to_link_ksettings(
        struct ethtool_link_ksettings *link_ksettings,
        const struct ethtool_cmd *legacy_settings);
 -int ethtool_get_max_rxfh_channel(struct net_device *dev, u32 *max);
 +u32 ethtool_get_max_rxfh_channel(struct net_device *dev);
  int ethtool_get_max_rxnfc_channel(struct net_device *dev, u64 *max);
- int __ethtool_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info);
+ int __ethtool_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info);
  
  extern const struct ethtool_phy_ops *ethtool_phy_ops;
  extern const struct ethtool_pse_ops *ethtool_pse_ops;

diff --cc net/ethtool/ioctl.c
Simple merge