rebase patches on top of Ubuntu-6.1.0-12.12
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
5e31f96e2c
commit
898be11352
@ -10,7 +10,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/net/core/dev.c b/net/core/dev.c
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||||
index 3be256051e99..e79b1695a4cb 100644
|
index 70e06853ba25..81190dfbfb3f 100644
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -10273,7 +10273,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
|
@@ -10273,7 +10273,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
Date: Sat, 12 Mar 2022 16:19:10 +0100
|
|
||||||
Subject: [PATCH] Ubuntu: remove leftover reference to ubuntu/hio driver
|
|
||||||
|
|
||||||
A single reference to the hio driver was forgotten when it was removed
|
|
||||||
recently. While this reference is not a problem for the build itself, it
|
|
||||||
breaks the __clean target from 'scripts/Makefile.clean' here, as make
|
|
||||||
cannot enter the "ubuntu/hio" folder for cleaning due to ENOENT.
|
|
||||||
|
|
||||||
Fixes: 4ea6dd9afa0a0d ("UBUNTU: Remove ubuntu/hio driver")
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
ubuntu/Makefile | 4 ----
|
|
||||||
1 file changed, 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
|
|
||||||
index 27fa95ba242a..3bfc4494c069 100644
|
|
||||||
--- a/ubuntu/Makefile
|
|
||||||
+++ b/ubuntu/Makefile
|
|
||||||
@@ -15,10 +15,6 @@
|
|
||||||
##
|
|
||||||
##
|
|
||||||
##
|
|
||||||
-obj-$(CONFIG_HIO) += hio/
|
|
||||||
-##
|
|
||||||
-##
|
|
||||||
-##
|
|
||||||
obj-$(CONFIG_UBUNTU_HOST) += ubuntu-host/
|
|
||||||
##
|
|
||||||
##
|
|
Loading…
Reference in New Issue
Block a user