diff for duplicates of <20180103170955.343662722@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 2cba8db..43d830c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,8 +18,7 @@ The patch is against Dave Miller's 'net.git' repo. 1 file changed, 22 insertions(+), 3 deletions(-) Index: net/drivers/net/ethernet/renesas/sh_eth.c -=================================================================== ---- net.orig/drivers/net/ethernet/renesas/sh_eth.c +=================================--- net.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net/drivers/net/ethernet/renesas/sh_eth.c @@ -3225,10 +3225,29 @@ static int sh_eth_drv_probe(struct platf /* ioremap the TSU registers */ @@ -38,7 +37,7 @@ Index: net/drivers/net/ethernet/renesas/sh_eth.c + /* We can only request the TSU region for the first port + * of the two sharing this TSU for the probe to succeed... + */ -+ if (devno % 2 == 0 && ++ if (devno % 2 = 0 && + !devm_request_mem_region(&pdev->dev, rtsu->start, + resource_size(rtsu), + dev_name(&pdev->dev))) { diff --git a/a/content_digest b/N1/content_digest index 6f5a402..b67622f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,12 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] sh_eth: fix TSU resource handling\0" - "Date\0Wed, 03 Jan 2018 20:09:49 +0300\0" + "Date\0Wed, 03 Jan 2018 17:09:49 +0000\0" "To\0netdev@vger.kernel.org" " linux-renesas-soc@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> " Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "\00:1\0" - "fn\0sh_eth-fix-TSU-resource-handling.patch\0" "b\0" "When switching the driver to the managed device API, I managed to break\n" "the case of a dual Ether devices sharing a single TSU: the 2nd Ether port\n" @@ -29,8 +28,7 @@ " 1 file changed, 22 insertions(+), 3 deletions(-)\n" "\n" "Index: net/drivers/net/ethernet/renesas/sh_eth.c\n" - "===================================================================\n" - "--- net.orig/drivers/net/ethernet/renesas/sh_eth.c\n" + "=================================--- net.orig/drivers/net/ethernet/renesas/sh_eth.c\n" "+++ net/drivers/net/ethernet/renesas/sh_eth.c\n" "@@ -3225,10 +3225,29 @@ static int sh_eth_drv_probe(struct platf\n" " \t/* ioremap the TSU registers */\n" @@ -49,7 +47,7 @@ "+\t\t/* We can only request the TSU region for the first port\n" "+\t\t * of the two sharing this TSU for the probe to succeed...\n" "+\t\t */\n" - "+\t\tif (devno % 2 == 0 &&\n" + "+\t\tif (devno % 2 = 0 &&\n" "+\t\t !devm_request_mem_region(&pdev->dev, rtsu->start,\n" "+\t\t\t\t\t resource_size(rtsu),\n" "+\t\t\t\t\t dev_name(&pdev->dev))) {\n" @@ -66,4 +64,4 @@ " \t\t}\n" " \t\tmdp->port = devno % 2;" -bb04cdecc320424a83ca6334f089f0b0694c9f5ee87f2080d9a388873b213f54 +962a49664e344e8bf49e0e2070795f34886a7f7ecdf34cf037311574ded02d10
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.