From: Greg Kroah-Hartman Date: Tue, 1 Jun 2021 07:20:17 +0000 (+0200) Subject: patch refresh X-Git-Tag: v4.4.271~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8b74872819df49cee014dfcb29cafdc03d65d45;p=thirdparty%2Fkernel%2Fstable-queue.git patch refresh --- diff --git a/queue-4.14/net-netcp-fix-an-error-message.patch b/queue-4.14/net-netcp-fix-an-error-message.patch index 4cc23344b15..ba2f46103ac 100644 --- a/queue-4.14/net-netcp-fix-an-error-message.patch +++ b/queue-4.14/net-netcp-fix-an-error-message.patch @@ -18,14 +18,12 @@ Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c -index 1b2702f74455..4154c48d1ddf 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) +@@ -1364,9 +1364,9 @@ int netcp_txpipe_open(struct netcp_tx_pi tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id, KNAV_QUEUE_SHARED); if (IS_ERR(tx_pipe->dma_queue)) { @@ -36,6 +34,3 @@ index 1b2702f74455..4154c48d1ddf 100644 goto err; } --- -2.30.2 - diff --git a/queue-4.19/net-netcp-fix-an-error-message.patch b/queue-4.19/net-netcp-fix-an-error-message.patch index 4cc23344b15..ba2f46103ac 100644 --- a/queue-4.19/net-netcp-fix-an-error-message.patch +++ b/queue-4.19/net-netcp-fix-an-error-message.patch @@ -18,14 +18,12 @@ Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c -index 1b2702f74455..4154c48d1ddf 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) +@@ -1364,9 +1364,9 @@ int netcp_txpipe_open(struct netcp_tx_pi tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id, KNAV_QUEUE_SHARED); if (IS_ERR(tx_pipe->dma_queue)) { @@ -36,6 +34,3 @@ index 1b2702f74455..4154c48d1ddf 100644 goto err; } --- -2.30.2 - diff --git a/queue-4.4/net-netcp-fix-an-error-message.patch b/queue-4.4/net-netcp-fix-an-error-message.patch index 4cc23344b15..d95f76e4adc 100644 --- a/queue-4.4/net-netcp-fix-an-error-message.patch +++ b/queue-4.4/net-netcp-fix-an-error-message.patch @@ -18,14 +18,12 @@ Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c -index 1b2702f74455..4154c48d1ddf 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) +@@ -1284,9 +1284,9 @@ int netcp_txpipe_open(struct netcp_tx_pi tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id, KNAV_QUEUE_SHARED); if (IS_ERR(tx_pipe->dma_queue)) { @@ -36,6 +34,3 @@ index 1b2702f74455..4154c48d1ddf 100644 goto err; } --- -2.30.2 - diff --git a/queue-4.9/net-netcp-fix-an-error-message.patch b/queue-4.9/net-netcp-fix-an-error-message.patch index 4cc23344b15..c78e93433a5 100644 --- a/queue-4.9/net-netcp-fix-an-error-message.patch +++ b/queue-4.9/net-netcp-fix-an-error-message.patch @@ -18,14 +18,12 @@ Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c -index 1b2702f74455..4154c48d1ddf 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -1350,9 +1350,9 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) +@@ -1325,9 +1325,9 @@ int netcp_txpipe_open(struct netcp_tx_pi tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id, KNAV_QUEUE_SHARED); if (IS_ERR(tx_pipe->dma_queue)) { @@ -36,6 +34,3 @@ index 1b2702f74455..4154c48d1ddf 100644 goto err; } --- -2.30.2 -