update submodule and patches to Ubuntu-5.4.0-66.74
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
		
							parent
							
								
									4a78268a29
								
							
						
					
					
						commit
						0657a49870
					
				@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 | 
			
		||||
 2 files changed, 111 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 | 
			
		||||
index 6351dd00e363..7e8ea458052b 100644
 | 
			
		||||
index 9d66e884ebf5..37040e842a24 100644
 | 
			
		||||
--- a/Documentation/admin-guide/kernel-parameters.txt
 | 
			
		||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
 | 
			
		||||
@@ -3441,6 +3441,15 @@
 | 
			
		||||
 | 
			
		||||
@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 | 
			
		||||
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/net/core/dev.c b/net/core/dev.c
 | 
			
		||||
index 134add2cc8da..5be8d3b4cf68 100644
 | 
			
		||||
index 6dbffd07edc4..fc1ee6073285 100644
 | 
			
		||||
--- a/net/core/dev.c
 | 
			
		||||
+++ b/net/core/dev.c
 | 
			
		||||
@@ -9279,7 +9279,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | 
			
		||||
@@ -9281,7 +9281,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | 
			
		||||
 		refcnt = netdev_refcnt_read(dev);
 | 
			
		||||
 
 | 
			
		||||
 		if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
 | 
			
		||||
 | 
			
		||||
@ -1,47 +0,0 @@
 | 
			
		||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 | 
			
		||||
Date: Thu, 3 Dec 2020 07:45:18 +0100
 | 
			
		||||
Subject: [PATCH] Revert "scsi: be2iscsi: Fix a theoretical leak in
 | 
			
		||||
 beiscsi_create_eqs()"
 | 
			
		||||
 | 
			
		||||
This reverts commit 552b270b5784dc322807df89eb359e74fc570fde.
 | 
			
		||||
---
 | 
			
		||||
 drivers/scsi/be2iscsi/be_main.c | 4 ++--
 | 
			
		||||
 1 file changed, 2 insertions(+), 2 deletions(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
 | 
			
		||||
index 0fa455357594..0760d0bd8a10 100644
 | 
			
		||||
--- a/drivers/scsi/be2iscsi/be_main.c
 | 
			
		||||
+++ b/drivers/scsi/be2iscsi/be_main.c
 | 
			
		||||
@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
 | 
			
		||||
 			goto create_eq_error;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
-		mem->dma = paddr;
 | 
			
		||||
 		mem->va = eq_vaddress;
 | 
			
		||||
 		ret = be_fill_queue(eq, phba->params.num_eq_entries,
 | 
			
		||||
 				    sizeof(struct be_eq_entry), eq_vaddress);
 | 
			
		||||
@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
 | 
			
		||||
 			goto create_eq_error;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
+		mem->dma = paddr;
 | 
			
		||||
 		ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,
 | 
			
		||||
 					    BEISCSI_EQ_DELAY_DEF);
 | 
			
		||||
 		if (ret) {
 | 
			
		||||
@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
 | 
			
		||||
 			goto create_cq_error;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
-		mem->dma = paddr;
 | 
			
		||||
 		ret = be_fill_queue(cq, phba->params.num_cq_entries,
 | 
			
		||||
 				    sizeof(struct sol_cqe), cq_vaddress);
 | 
			
		||||
 		if (ret) {
 | 
			
		||||
@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
 | 
			
		||||
 			goto create_cq_error;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
+		mem->dma = paddr;
 | 
			
		||||
 		ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,
 | 
			
		||||
 					    false, 0);
 | 
			
		||||
 		if (ret) {
 | 
			
		||||
@ -1 +1 @@
 | 
			
		||||
Subproject commit f8a15b6729cff5f5a39e1c941fa36f61c511df34
 | 
			
		||||
Subproject commit 0ff1d85115fed37c84dae5b161023fe20c2c5863
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user