Stable Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"
@ 2020-06-24 12:45 Vladimir Oltean
  2020-07-30  7:30 ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Oltean @ 2020-06-24 12:45 UTC (permalink / raw)
  To: stable, gregkh, netdev
  Cc: madalin.bucur, camelia.groza, joakim.tjernlund, fido_max, linux-kernel

From: Vladimir Oltean <vladimir.oltean@nxp.com>

This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8.

The patch is not wrong, but the Fixes: tag is. It should have been:

	Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")

which means that it's fixing a commit which was introduced in:

git tag --contains 060ad66f97954
v5.5

which then means it should have not been backported to linux-5.4.y,
where things _were_ working and now they're not.

Reported-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Changes in v1:
Adjusted the commit message from linux-4.19.y to linux-5.4.y

Changes in v2:
Fixed the sha1sum of the reverted commit.

 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 6683409fbd4a..4b21ae27a9fd 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
 	}
 
 	/* Do this here, so we can be verbose early */
-	SET_NETDEV_DEV(net_dev, dev->parent);
+	SET_NETDEV_DEV(net_dev, dev);
 	dev_set_drvdata(dev, net_dev);
 
 	priv = netdev_priv(net_dev);
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"
  2020-06-24 12:45 [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3" Vladimir Oltean
@ 2020-07-30  7:30 ` Greg KH
  2020-07-30  8:25   ` Vladimir Oltean
  0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2020-07-30  7:30 UTC (permalink / raw)
  To: Vladimir Oltean
  Cc: stable, netdev, madalin.bucur, camelia.groza, joakim.tjernlund,
	fido_max, linux-kernel

On Wed, Jun 24, 2020 at 03:45:17PM +0300, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
> 
> This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8.
> 
> The patch is not wrong, but the Fixes: tag is. It should have been:
> 
> 	Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
> 
> which means that it's fixing a commit which was introduced in:
> 
> git tag --contains 060ad66f97954
> v5.5
> 
> which then means it should have not been backported to linux-5.4.y,
> where things _were_ working and now they're not.
> 
> Reported-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
> Changes in v1:
> Adjusted the commit message from linux-4.19.y to linux-5.4.y
> 
> Changes in v2:
> Fixed the sha1sum of the reverted commit.
> 
>  drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> index 6683409fbd4a..4b21ae27a9fd 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
>  	}
>  
>  	/* Do this here, so we can be verbose early */
> -	SET_NETDEV_DEV(net_dev, dev->parent);
> +	SET_NETDEV_DEV(net_dev, dev);
>  	dev_set_drvdata(dev, net_dev);
>  
>  	priv = netdev_priv(net_dev);
> -- 
> 2.25.1
> 

Now queued up, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"
  2020-07-30  7:30 ` Greg KH
@ 2020-07-30  8:25   ` Vladimir Oltean
  0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Oltean @ 2020-07-30  8:25 UTC (permalink / raw)
  To: Greg KH
  Cc: stable, netdev, madalin.bucur, camelia.groza, joakim.tjernlund,
	fido_max, linux-kernel

On Thu, Jul 30, 2020 at 09:30:13AM +0200, Greg KH wrote:
> 
> Now queued up, thanks.
> 
> greg k-h

Thanks Greg, I was wondering whether I should be reminding you or not.

-Vladimir

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-24 12:45 [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3" Vladimir Oltean
2020-07-30  7:30 ` Greg KH
2020-07-30  8:25   ` Vladimir Oltean

Stable Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://lore.kernel.org/stable \
		stable@vger.kernel.org
	public-inbox-index stable

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git