diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 14:07:31 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 14:08:18 -0400 |
| commit | d6654b65d00ca5d3a8326ea84c08389aa0a9b7f1 (patch) | |
| tree | acd7c41e76903e4d0ace7feec1f848e12ed25e9f | |
| parent | a640fbf5793bb5e91817a9b934696c30e857cf42 (diff) | |
| download | longterm-queue-5.2-d6654b65d00ca5d3a8326ea84c08389aa0a9b7f1.tar.gz | |
fsl: dpaa: fix up revert ID to match v5.2.x instead of v5.4.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Revert-dpaa_eth-fix-usage-as-DSA-master-try-3.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/queue/Revert-dpaa_eth-fix-usage-as-DSA-master-try-3.patch b/queue/Revert-dpaa_eth-fix-usage-as-DSA-master-try-3.patch index 638c0da2..4c0a5672 100644 --- a/queue/Revert-dpaa_eth-fix-usage-as-DSA-master-try-3.patch +++ b/queue/Revert-dpaa_eth-fix-usage-as-DSA-master-try-3.patch @@ -3,7 +3,8 @@ From: Vladimir Oltean <vladimir.oltean@nxp.com> Date: Wed, 24 Jun 2020 15:45:17 +0300 Subject: [PATCH] Revert "dpaa_eth: fix usage as DSA master, try 3" -This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8. +This reverts commit e930ef001d91b6c8446e52719966cc86c46e29a0 which was +commit 5d14c304bfc14b4fd052dc83d5224376b48f52f0 upstream. The patch is not wrong, but the Fixes: tag is. It should have been: @@ -20,6 +21,7 @@ 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index ecf9cc1ffafa..1315cc42c88f 100644 |