Received-SPF: pass (google.com: domain of linux-kernel+bounces-138298-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Wed, 10 Apr 2024 11:04:36 +0100
From: "Russell King (Oracle)" <linux@armlinux.org.uk>
To: Kory Maincent <kory.maincent@bootlin.com>
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: <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>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240410101200.0178e594@kmaincent-XPS-13-7390>
Sender: Russell King (Oracle) <linux@armlinux.org.uk>

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:
> 
> > On Tue, 09 Apr 2024 10:26:29 +0200 Kory Maincent wrote:
> > > 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 format through the
> > > ETHTOOL_GET_TS_INFO ethtool ioctl. It would be good if new kernel code
> > > already started operating on an extensible kernel variant of that
> > > structure, similar in concept to struct kernel_hwtstamp_config vs struct
> > > hwtstamp_config.
> > > 
> > > Since struct ethtool_ts_info is in include/uapi/linux/ethtool.h, here
> > > 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.
> > >  
> > 
> > This one now conflicts :(
> > 
> > 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
> 
> gnn patching my out of tree patch in the series! Sorry for that.

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.)

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!