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 4cc23344b15dccbdc6caf3692a1568c3cf3db3dc..ba2f46103accafa5182c876258f55e2e60448607 100644 (file)
--- 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 <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 4cc23344b15dccbdc6caf3692a1568c3cf3db3dc..ba2f46103accafa5182c876258f55e2e60448607 100644 (file)
--- 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 <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 4cc23344b15dccbdc6caf3692a1568c3cf3db3dc..d95f76e4adcaa68c082e9300908916ba0d4775f0 100644 (file)
--- 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 <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 4cc23344b15dccbdc6caf3692a1568c3cf3db3dc..c78e93433a56c8d0be94dc660746aec506f1d7f5 100644 (file)
--- 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 <christophe.jaillet@wanadoo.fr>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-