rebase patches on top of Ubuntu-5.13.0-31.34
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
		
							parent
							
								
									8035e345a3
								
							
						
					
					
						commit
						3941d44fc1
					
				@ -55,10 +55,10 @@ 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 8df03f305028..da782f53ce4b 100644
 | 
			
		||||
index 9e8737ef004e..e4705f335673 100644
 | 
			
		||||
--- a/Documentation/admin-guide/kernel-parameters.txt
 | 
			
		||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
 | 
			
		||||
@@ -3808,6 +3808,15 @@
 | 
			
		||||
@@ -3814,6 +3814,15 @@
 | 
			
		||||
 				Also, it enforces the PCI Local Bus spec
 | 
			
		||||
 				rule that those bits should be 0 in system reset
 | 
			
		||||
 				events (useful for kexec/kdump cases).
 | 
			
		||||
 | 
			
		||||
@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 | 
			
		||||
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 | 
			
		||||
index 3b316cb42554..71aba634a6a8 100644
 | 
			
		||||
index b86d4bce9793..946643fa1aa1 100644
 | 
			
		||||
--- a/virt/kvm/kvm_main.c
 | 
			
		||||
+++ b/virt/kvm/kvm_main.c
 | 
			
		||||
@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);
 | 
			
		||||
 | 
			
		||||
@ -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 7f5c73b6166f..cd2f2f5b00a5 100644
 | 
			
		||||
index 7bac7947d8b8..4196ce468b10 100644
 | 
			
		||||
--- a/net/core/dev.c
 | 
			
		||||
+++ b/net/core/dev.c
 | 
			
		||||
@@ -10530,7 +10530,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | 
			
		||||
@@ -10533,7 +10533,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | 
			
		||||
 		if (refcnt != 1 &&
 | 
			
		||||
 		    time_after(jiffies, warning_time +
 | 
			
		||||
 			       netdev_unregister_timeout_secs * HZ)) {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user