rebase patches on top of Ubuntu-5.11.0-23.24
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
		
							parent
							
								
									f235762658
								
							
						
					
					
						commit
						be7e04a3d7
					
				| @ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |||||||
|  2 files changed, 111 insertions(+) |  2 files changed, 111 insertions(+) | ||||||
| 
 | 
 | ||||||
| diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 | diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 | ||||||
| index a74453c464b0..dca92e06e431 100644
 | index 52b2f13eb26f..8c1bec09424b 100644
 | ||||||
| --- a/Documentation/admin-guide/kernel-parameters.txt
 | --- a/Documentation/admin-guide/kernel-parameters.txt
 | ||||||
| +++ b/Documentation/admin-guide/kernel-parameters.txt
 | +++ b/Documentation/admin-guide/kernel-parameters.txt
 | ||||||
| @@ -3646,6 +3646,15 @@
 | @@ -3647,6 +3647,15 @@
 | ||||||
|  				Also, it enforces the PCI Local Bus spec |  				Also, it enforces the PCI Local Bus spec | ||||||
|  				rule that those bits should be 0 in system reset |  				rule that those bits should be 0 in system reset | ||||||
|  				events (useful for kexec/kdump cases). |  				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(-) |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 | diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 | ||||||
| index 2caba2828982..2080de085df5 100644
 | index 7377346be880..0979e4ab19ae 100644
 | ||||||
| --- a/virt/kvm/kvm_main.c
 | --- a/virt/kvm/kvm_main.c
 | ||||||
| +++ b/virt/kvm/kvm_main.c
 | +++ b/virt/kvm/kvm_main.c
 | ||||||
| @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);
 | @@ -77,7 +77,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(-) |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/net/core/dev.c b/net/core/dev.c
 | diff --git a/net/core/dev.c b/net/core/dev.c
 | ||||||
| index a5a1dbe66b76..3847f4542b81 100644
 | index 76e593a4cc30..c1e9097e7a08 100644
 | ||||||
| --- a/net/core/dev.c
 | --- a/net/core/dev.c
 | ||||||
| +++ b/net/core/dev.c
 | +++ b/net/core/dev.c
 | ||||||
| @@ -10300,7 +10300,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | @@ -10346,7 +10346,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
 | ||||||
|  		refcnt = netdev_refcnt_read(dev); |  		refcnt = netdev_refcnt_read(dev); | ||||||
|   |   | ||||||
|  		if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) { |  		if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Thomas Lamprecht
						Thomas Lamprecht