Received-SPF: pass (google.com: domain of linux-kernel+bounces-138685-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 10 Apr 2024 15:54:12 +0200
From: Kory Maincent <kory.maincent@bootlin.com>
To: "Russell King (Oracle)" <linux@armlinux.org.uk>
Cc: Jakub Kicinski <kuba@kernel.org>, Florian Fainelli
 <florian.fainelli@broadcom.com>, Broadcom internal kernel review list
 <bcm-kernel-feedback-list@broadcom.com>, Andrew Lunn <andrew@lunn.ch>,
 Heiner Kallweit <hkallweit1@gmail.com>, "David S. Miller"
 <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Paolo Abeni
 <pabeni@redhat.com>, Richard Cochran <richardcochran@gmail.com>, Radu Pirea
 <radu-nicolae.pirea@oss.nxp.com>, Jay Vosburgh <j.vosburgh@gmail.com>, Andy
 Gospodarek <andy@greyhouse.net>, Nicolas Ferre
 <nicolas.ferre@microchip.com>, Claudiu Beznea <claudiu.beznea@tuxon.dev>,
 Willem de Bruijn <willemdebruijn.kernel@gmail.com>, Jonathan Corbet
 <corbet@lwn.net>, Horatiu Vultur <horatiu.vultur@microchip.com>,
 UNGLinuxDriver@microchip.com, Simon Horman <horms@kernel.org>, Vladimir
 Oltean <vladimir.oltean@nxp.com>, Thomas Petazzoni
 <thomas.petazzoni@bootlin.com>, netdev@vger.kernel.org,
 linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Maxime Chevallier
 <maxime.chevallier@bootlin.com>, Rahul Rameshbabu <rrameshbabu@nvidia.com>,
 Alexandra Winter <wintera@linux.ibm.com>
Subject: Re: [PATCH net-next v10 07/13] net: Add struct
 kernel_ethtool_ts_info
Message-ID: <20240410155412.2f34a117@kmaincent-XPS-13-7390>
In-Reply-To: <ZhZkNEYnY3FV7Q8E@shell.armlinux.org.uk>
References: <20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com>
	<20240409-feature_ptp_netnext-v10-7-0fa2ea5c89a9@bootlin.com>
	<20240409182725.139856d5@kernel.org>
	<20240410101200.0178e594@kmaincent-XPS-13-7390>
	<ZhZkNEYnY3FV7Q8E@shell.armlinux.org.uk>
Organization: bootlin
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Wed, 10 Apr 2024 11:04:36 +0100
"Russell King (Oracle)" <linux@armlinux.org.uk> wrote:

> On Wed, Apr 10, 2024 at 10:12:00AM +0200, Kory Maincent wrote:
> > On Tue, 9 Apr 2024 18:27:25 -0700
> > Jakub Kicinski <kuba@kernel.org> wrote:
> >  =20
> > > On Tue, 09 Apr 2024 10:26:29 +0200 Kory Maincent wrote: =20
> > > > In prevision to add new UAPI for hwtstamp we will be limited to the
> > > > struct ethtool_ts_info that is currently passed in fixed binary for=
mat
> > > > through the ETHTOOL_GET_TS_INFO ethtool ioctl. It would be good if =
new
> > > > kernel code already started operating on an extensible kernel varia=
nt
> > > > of that structure, similar in concept to struct kernel_hwtstamp_con=
fig
> > > > vs struct hwtstamp_config.
> > > >=20
> > > > Since struct ethtool_ts_info is in include/uapi/linux/ethtool.h, he=
re
> > > > we introduce the kernel-only structure in include/linux/ethtool.h.
> > > > The manual copy is then made in the function called by
> > > > ETHTOOL_GET_TS_INFO.=20
> > >=20
> > > This one now conflicts :(
> > >=20
> > > Applying: net: Add struct kernel_ethtool_ts_info
> > > error: sha1 information is lacking or useless
> > > (drivers/net/phy/marvell_ptp.c). error: could not build fake ancestor=
 =20
> >=20
> > gnn patching my out of tree patch in the series! Sorry for that. =20
>=20
> Given that this path corresponds to the driver I wrote, do I assume
> that you've picked up my work on PTP support for Marvell PHYs? You
> should be aware that I still have the patches out of tree but it's
> been pointless me reposting it until the issue of which PTP gets
> used has been solved. (Publishing will just increase the pressure
> to merge it without the PTP problems being solved, and thus break
> Marvell PP2 PTP.)

Yes I did with few fixes and I know you don't want to post the patches until
setting which PTP gets used has been solved. As you can see this is one of =
the
subject of this series. About it, could you review this series? This would =
help
a lot and you will be able to post again your Marvell PTP patches if its get
merged.

Regards,
--=20
K=C3=B6ry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com