From: Willy Tarreau w@1wt.eu Date: Wed, 28 Mar 2018 17:40:15 +0200

Hi David,

On Wed, Mar 28, 2018 at 11:35:10AM -0400, David Miller wrote:

...

Please queue up the following networking bug fixes for v4.14 and v4.15 -stable, respecetively.

I don't know if you saw my e-mail last week about this patch that's part of the 4.14 queue :

[linux-stable-4.14] tcp: reset sk_send_head in tcp_write_queue_purge

There are some typos in commit IDs referenced in the commit message which I think should be edited before being merged (especially since this one is stable-only and not in mainline) :

"27fid7a8ed38"  => "a27fd7a8ed38"
"a27fid7a8ed38" => "a27fd7a8ed38"  (Fixes: line)

Greg, maybe it's better to edit this before applying ?

Greg, feel free to correct this.

Thanks Willy.

-----Original Message----- From: Jiri Slaby [mailto:jslaby@suse.cz] Sent: Thursday, June 28, 2018 5:24 PM To: David Miller davem@davemloft.net; stable@vger.kernel.org; Greg KH gregkh@linuxfoundation.org; Madalin-cristian Bucur madalin.bucur@nxp.com Subject: dpaa_eth bad stable backport [was: [PATCHES] Networking]

On 03/28/2018, 05:35 PM, David Miller wrote:

...

Please queue up the following networking bug fixes for v4.14 and v4.15 -stable, respecetively.

Hi,

I wonder if this commit from this batch is correct in 4.14 and 4.15: commit 5bbb99d2fde047df596379be6c58e265e2ddbe1f Author: Madalin Bucur madalin.bucur@nxp.com Date: Wed Mar 14 08:37:29 2018 -0500

dpaa_eth: fix error in dpaa_remove()

[ Upstream commit 88075256ee817041d68c2387f29065b5cb2b342a ]

In 4.14 and 4.15, the drvdata are set like this: dev = &pdev->dev; ... dev_set_drvdata(dev, net_dev);

Opposing to 4.16: dev = pdev->dev.parent; ... dev_set_drvdata(dev, net_dev);

So the change in dpaa_remove done by the commit above is wrong IMO:

•   dev = &pdev->dev;
  

•   dev = pdev->dev.parent;
    net_dev = dev_get_drvdata(dev);
  
  
  
  

Hence this should be reverted from 4.14-LTS. I think 4.15 is dead.

thanks,

js suse labs

Hi, The change in this commit completes the changes made in this previous commit:

commit c6e26ea8c893687a83c9feda7ab4f89205e19726 Author: Madalin Bucur madalin.bucur@nxp.com Date: Mon Oct 16 21:36:07 2017 +0300

dpaa_eth: change device used

Change device used for DMA mapping to the MAC device that is an of_device, with proper DMA ops. Using this device for the netdevice should also address the issue with DSA scenarios that need the netdevice to be backed by an of_device.

Signed-off-by: Madalin Bucur madalin.bucur@nxp.com Signed-off-by: David S. Miller davem@davemloft.net

If this particular previous commit is missing from the tree, the dpaa_remove() fix is not required.

Thanks, Madalin