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
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From a64e93a757edfad34955b79f1774d10e9dae955e Mon Sep 17 00:00:00 2001
|
|
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Fri, 4 Dec 2020 12:43:47 +0100
|
|
Subject: [PATCH] driver core: auxiliary bus: move slab.h from include file
|
|
|
|
No need to include slab.h in include/linux/auxiliary_bus.h, as it is not
|
|
needed there. Move it to drivers/base/auxiliary.c instead.
|
|
|
|
Cc: Dan Williams <dan.j.williams@intel.com>
|
|
Cc: Dave Ertman <david.m.ertman@intel.com>
|
|
Cc: Fred Oh <fred.oh@linux.intel.com>
|
|
Cc: Kiran Patil <kiran.patil@intel.com>
|
|
Cc: Leon Romanovsky <leonro@nvidia.com>
|
|
Cc: Martin Habets <mhabets@solarflare.com>
|
|
Cc: Parav Pandit <parav@mellanox.com>
|
|
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
|
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
|
|
Link: https://lore.kernel.org/r/X8og8xi3WkoYXet9@kroah.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 7bbb79ff5f7499e0c5d65987458410e8099207d8)
|
|
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
|
---
|
|
drivers/base/auxiliary.c | 1 +
|
|
include/linux/auxiliary_bus.h | 1 -
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
|
|
index ef2af417438b..eca36d6284d0 100644
|
|
--- a/drivers/base/auxiliary.c
|
|
+++ b/drivers/base/auxiliary.c
|
|
@@ -9,6 +9,7 @@
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pm_domain.h>
|
|
#include <linux/pm_runtime.h>
|
|
diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h
|
|
index 282fbf7bf9af..3580743d0e8d 100644
|
|
--- a/include/linux/auxiliary_bus.h
|
|
+++ b/include/linux/auxiliary_bus.h
|
|
@@ -10,7 +10,6 @@
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/mod_devicetable.h>
|
|
-#include <linux/slab.h>
|
|
|
|
struct auxiliary_device {
|
|
struct device dev;
|
|
--
|
|
2.29.2
|
|
|