998d337c2b
To keep kernel debian stx aligned with centos stx, porting below commits
from centos stx to debian stx:
(1)patches related
ef3c9a4 kernel: Add auxiliary bus support
19ca0df kernel: Backport IRQ affinity patches
a10b746 workqueue affinity: Remove unused variable
8fde1a8 kthread_cpus: Avoid large stack allocation
bb6ec66 scsi: Make the disk detection order more consistent
bf940a8 rcu: Avoid RCU-related unexpected reboot
cfe452a workqueue: Affine rescuer threads and unbound wqs
(2)config related
6fe8d60 kernel: Disable NVMe multi-path kconfig option
c9cdb90 Fixup recent kconfig cleanup
8551799 Resolve v5.10 kernel configuration file differences
(3)kernel-modules related
7ded004 kernel-modules: IRQ affinity hint fix-ups
Please pay attention to:
[ef3c9a4 kernel: Add auxiliary bus support]
which is not only related with kernel patches but also related with
kernel-modules.
It removes the auxiliary.ko from the oot ice package because auxiliary
bus device driver is built into kernel. But the detecting of builtin
auxiliary driver in intel-iavf/intel-ice oot driver will fail because
debian has 2 linux header packages. So extra patches are added for
intel-iavf and intel-ice to pass linux common header to check_aux_bus
to make builtin auxiliary driver detected. At the same time the patch
[check_aux_bus: Look for kernel headers in the right location]
for the oot drivers is removed because it isn't needed any more if
the right header path is passed.
Test Plan:
- PASS: Build kernel-std/kernel-rt.
- PASS: Build the 7 oot kernel modules for kernel-std/kernel-rt.
- PASS: Build the iso for kernel-std and modules and boot up on qemu.
- PASS: Build the test iso for kernel-rt and modules and boot up
on qemu.
Story: 2009221
Task: 44989
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Change-Id: Ic7cddc068eab1516800e90bfe431d042274f86d3
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From bcfe18a2fd6d45f14ae60c742a7661a64e46305e Mon Sep 17 00:00:00 2001
|
|
From: Dave Jiang <dave.jiang@intel.com>
|
|
Date: Thu, 11 Feb 2021 13:21:29 -0700
|
|
Subject: [PATCH] driver core: auxiliary bus: Remove unneeded module bits
|
|
|
|
Remove module bits in the auxiliary bus code since the auxiliary bus
|
|
cannot be built as a module and the relevant code is not needed.
|
|
|
|
Cc: Dave Ertman <david.m.ertman@intel.com>
|
|
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
|
|
Link: https://lore.kernel.org/r/161307488980.1896017.15627190714413338196.stgit@djiang5-desk3.ch.intel.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit bbf44abeeabfe05a124535e6c3a9fd7d682d42bf)
|
|
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
|
---
|
|
drivers/base/auxiliary.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
|
|
index d8b314e7d0fd..adc199dfba3c 100644
|
|
--- a/drivers/base/auxiliary.c
|
|
+++ b/drivers/base/auxiliary.c
|
|
@@ -265,8 +265,3 @@ void __init auxiliary_bus_init(void)
|
|
{
|
|
WARN_ON(bus_register(&auxiliary_bus_type));
|
|
}
|
|
-
|
|
-MODULE_LICENSE("GPL v2");
|
|
-MODULE_DESCRIPTION("Auxiliary Bus");
|
|
-MODULE_AUTHOR("David Ertman <david.m.ertman@intel.com>");
|
|
-MODULE_AUTHOR("Kiran Patil <kiran.patil@intel.com>");
|
|
--
|
|
2.29.2
|
|
|