diff for duplicates of <20200805112746.15475-1-peter.ujfalusi@ti.com> diff --git a/a/1.txt b/N1/1.txt index 23d95ae..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,36 +1 @@ -The original commit mixed up the forward and completion ring IDs for the -rx flow configuration. -Fixes: 4927b1ab2047 ("dmaengine: ti: k3-udma: Switch to k3_ringacc_request_rings_pair") -Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> ---- -Hi Santosh, Vinod, - -the offending patch was queued via ti SoC tree. -Santosh, can you pick up this fix also? - -Regards, -Peter - - drivers/dma/ti/k3-udma-glue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/dma/ti/k3-udma-glue.c b/drivers/dma/ti/k3-udma-glue.c -index 3a5d33ea5ebe..12da38a92218 100644 ---- a/drivers/dma/ti/k3-udma-glue.c -+++ b/drivers/dma/ti/k3-udma-glue.c -@@ -579,8 +579,8 @@ static int k3_udma_glue_cfg_rx_flow(struct k3_udma_glue_rx_channel *rx_chn, - - /* request and cfg rings */ - ret = k3_ringacc_request_rings_pair(rx_chn->common.ringacc, -- flow_cfg->ring_rxq_id, - flow_cfg->ring_rxfdq0_id, -+ flow_cfg->ring_rxq_id, - &flow->ringrxfdq, - &flow->ringrx); - if (ret) { --- -Peter - -Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. -Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/a/content_digest b/N1/content_digest index 40dca2f..348fa9f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,41 +10,5 @@ " <dmaengine@vger.kernel.org>\0" "\00:1\0" "b\0" - "The original commit mixed up the forward and completion ring IDs for the\n" - "rx flow configuration.\n" - "\n" - "Fixes: 4927b1ab2047 (\"dmaengine: ti: k3-udma: Switch to k3_ringacc_request_rings_pair\")\n" - "Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>\n" - "---\n" - "Hi Santosh, Vinod,\n" - "\n" - "the offending patch was queued via ti SoC tree.\n" - "Santosh, can you pick up this fix also?\n" - "\n" - "Regards,\n" - "Peter\n" - "\n" - " drivers/dma/ti/k3-udma-glue.c | 2 +-\n" - " 1 file changed, 1 insertion(+), 1 deletion(-)\n" - "\n" - "diff --git a/drivers/dma/ti/k3-udma-glue.c b/drivers/dma/ti/k3-udma-glue.c\n" - "index 3a5d33ea5ebe..12da38a92218 100644\n" - "--- a/drivers/dma/ti/k3-udma-glue.c\n" - "+++ b/drivers/dma/ti/k3-udma-glue.c\n" - "@@ -579,8 +579,8 @@ static int k3_udma_glue_cfg_rx_flow(struct k3_udma_glue_rx_channel *rx_chn,\n" - " \n" - " \t/* request and cfg rings */\n" - " \tret = k3_ringacc_request_rings_pair(rx_chn->common.ringacc,\n" - "-\t\t\t\t\t flow_cfg->ring_rxq_id,\n" - " \t\t\t\t\t flow_cfg->ring_rxfdq0_id,\n" - "+\t\t\t\t\t flow_cfg->ring_rxq_id,\n" - " \t\t\t\t\t &flow->ringrxfdq,\n" - " \t\t\t\t\t &flow->ringrx);\n" - " \tif (ret) {\n" - "-- \n" - "Peter\n" - "\n" - "Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.\n" - Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki -9c1be27524373ecde03de2b6a6739bb935f4e00ab36739b74be6ff23ce32a507 +8f7c0dae5263f86cc33f10ea8fea019cc43868e69d0b473e5528aa44921c651e
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox