> -----Original Message----- > From: Claudiu Manoil > Sent: Thursday, May 16, 2019 9:31 PM > To: Y.b. Lu <yangbo.lu@xxxxxxx>; netdev@xxxxxxxxxxxxxxx; Richard Cochran > <richardcochran@xxxxxxxxx>; David Miller <davem@xxxxxxxxxxxxx>; Shawn > Guo <shawnguo@xxxxxxxxxx>; Rob Herring <robh+dt@xxxxxxxxxx> > Cc: devicetree@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > linux-kernel@xxxxxxxxxxxxxxx > Subject: RE: [PATCH 1/3] enetc: add hardware timestamping support > > >-----Original Message----- > >From: Y.b. Lu > [...] > >Subject: [PATCH 1/3] enetc: add hardware timestamping support > > > [...] > > Hi Yangbo, > > These enetc patches targeting net-next will have to be rebased on the latest > enetc net.git commits, otherwise there will be some merge conflicts for enetc.c > and enetc_ethtool.c. > Thanks, > Claudiu > > see > 22fb43f36006 "enetc: Add missing link state info for ethtool" > f4a0be84d73e "enetc: Fix NULL dma address unmap for Tx BD extensions" [Y.b. Lu] Thanks Claudiu. I should have noticed that. Let me send v2 after net-next is open.
