kernel-6.3.0-0.rc0.20230227gitf3a2439f20d9.9

* Mon Feb 27 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc0.f3a2439f20d9.9]
- Add more kunit tests to mod-internal.list for 6.3 (Justin M. Forbes)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-02-27 08:29:39 -06:00
commit decfec8468
No known key found for this signature in database
GPG key ID: B8FA7924A4B1C140
25 changed files with 987 additions and 45 deletions

View file

@ -67,10 +67,10 @@
66 files changed, 1540 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 21b7f87b00fe..ba987a83e847 100644
index 6221a1d057dd..90c169923eda 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6492,6 +6492,15 @@
@@ -6530,6 +6530,15 @@
unknown_nmi_panic
[X86] Cause panic on unknown NMI.
@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index 8e5621ddadb2..10c64cc021a3 100644
index aa26f34a9b52..f8ca2e66f4ef 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -134,7 +134,7 @@ index 8e5621ddadb2..10c64cc021a3 100644
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -1346,7 +1350,13 @@ define filechk_version.h
@@ -1335,7 +1339,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@ -250,10 +250,10 @@ index 8ec5cdf9dadc..e2b89563075b 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index a394bbba7a4b..48ddbcababb7 100644
index 8cd4126d8253..ec8ea861a798 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1576,6 +1576,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
@@ -1577,6 +1577,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
cpu_detect(c);
get_cpu_vendor(c);
get_cpu_cap(c);
@ -560,7 +560,7 @@ index b51f2a4c821e..be31d32aba53 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 1e0b016fdc2b..7417f131db15 100644
index abeff7dc0b58..6384796e76dd 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@ -571,7 +571,7 @@ index 1e0b016fdc2b..7417f131db15 100644
#include <asm/early_ioremap.h>
@@ -907,40 +908,101 @@ int efi_mem_type(unsigned long phys_addr)
@@ -947,40 +948,101 @@ int efi_mem_type(unsigned long phys_addr)
}
#endif
@ -851,7 +851,7 @@ index 84e7ba5314d3..efc96776f761 100644
data->xport.ops = &hid_rmi_ops;
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 1cc052979e01..c817bc0a90c5 100644
index 1ea8f173cca0..a9e3fb46c62c 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -9,6 +9,7 @@
@ -862,7 +862,7 @@ index 1cc052979e01..c817bc0a90c5 100644
#include <linux/io.h>
#include <linux/err.h>
#include <linux/fs.h>
@@ -2210,6 +2211,16 @@ static const struct amba_id etm4_ids[] = {
@@ -2267,6 +2268,16 @@ static const struct amba_id etm4_ids[] = {
{},
};
@ -879,7 +879,7 @@ index 1cc052979e01..c817bc0a90c5 100644
MODULE_DEVICE_TABLE(amba, etm4_ids);
static struct amba_driver etm4x_amba_driver = {
@@ -2243,6 +2254,11 @@ static int __init etm4x_init(void)
@@ -2300,6 +2311,11 @@ static int __init etm4x_init(void)
{
int ret;
@ -891,7 +891,7 @@ index 1cc052979e01..c817bc0a90c5 100644
ret = etm4_pm_setup();
/* etm4_pm_setup() does its own cleanup - exit on error */
@@ -2269,6 +2285,9 @@ static int __init etm4x_init(void)
@@ -2326,6 +2342,9 @@ static int __init etm4x_init(void)
static void __exit etm4x_exit(void)
{
@ -1094,7 +1094,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 5f6a85aea501..3b1e9faa9c2d 100644
index 10db680acaed..5c6cfbdbb361 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@
@ -1105,7 +1105,7 @@ index 5f6a85aea501..3b1e9faa9c2d 100644
#include <linux/kernel.h>
#include <linux/bits.h>
#include <linux/bug.h>
@@ -2793,6 +2794,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
@@ -2816,6 +2817,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
}
EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
@ -1364,7 +1364,7 @@ index bf46f122e9e1..06dd6bc08962 100644
{
}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index a2ceeacc33eb..be6e0feabf99 100644
index 57ddcc59af30..d26173fd62e3 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -19,6 +19,7 @@
@ -1460,7 +1460,7 @@ index a2ceeacc33eb..be6e0feabf99 100644
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 285acc4aaccc..a7056957e7dd 100644
index 44cab813bf95..4e8bd92f9cc4 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@ -1749,10 +1749,10 @@ index 005502125b27..cd577c40dcca 100644
};
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9eca403af2a8..ebe803d4ad4d 100644
index 97a0f8faea6e..d837548d2024 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5735,6 +5735,13 @@ static void hub_event(struct work_struct *work)
@@ -5734,6 +5734,13 @@ static void hub_event(struct work_struct *work)
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
@ -1781,7 +1781,7 @@ index eae288c8d40a..8b8bf447cedc 100644
error_proc:
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 98598bd1d2fa..34a6233fabaf 100644
index 04a733f0ba95..f5eb381ffed0 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -1793,7 +1793,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
typedef unsigned long efi_status_t;
typedef u8 efi_bool_t;
typedef u16 efi_char16_t; /* UNICODE character */
@@ -851,6 +853,14 @@ extern int __init efi_setup_pcdp_console(char *);
@@ -856,6 +858,14 @@ extern int __init efi_setup_pcdp_console(char *);
#define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
#define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */
#define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */
@ -1808,7 +1808,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
#ifdef CONFIG_EFI
/*
@@ -862,6 +872,8 @@ static inline bool efi_enabled(int feature)
@@ -867,6 +877,8 @@ static inline bool efi_enabled(int feature)
}
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
@ -1817,7 +1817,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
bool __pure __efi_soft_reserve_enabled(void);
static inline bool __pure efi_soft_reserve_enabled(void)
@@ -883,6 +895,8 @@ static inline bool efi_enabled(int feature)
@@ -888,6 +900,8 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
@ -1826,7 +1826,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
static inline bool efi_soft_reserve_enabled(void)
{
return false;
@@ -897,6 +911,7 @@ static inline void efi_find_mirror(void) {}
@@ -902,6 +916,7 @@ static inline void efi_find_mirror(void) {}
#endif
extern int efi_status_to_err(efi_status_t status);
@ -1834,7 +1834,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
/*
* Variable Attributes
@@ -1099,13 +1114,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
@@ -1107,13 +1122,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);
@ -1849,7 +1849,7 @@ index 98598bd1d2fa..34a6233fabaf 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
{
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index fe6efb24d151..85b185391da7 100644
index 40bce7495af8..fe339ce1a212 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -508,4 +508,25 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
@ -1909,10 +1909,10 @@ index 6e156d2acffc..cf65032538ea 100644
*
* @perf_event_open:
diff --git a/include/linux/module.h b/include/linux/module.h
index 514bc81568c5..13ab1e2efec6 100644
index 4435ad9439ab..b4ff17720fb9 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -379,6 +379,7 @@ struct module {
@@ -387,6 +387,7 @@ struct module {
struct module_attribute *modinfo_attrs;
const char *version;
const char *srcversion;
@ -1950,10 +1950,10 @@ index 979b776e3bcb..4eabcc0d8a91 100644
struct taint_flag {
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 254c8a4126a8..c0f718911aa9 100644
index fafd8020c6d7..913ac81ccf34 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1520,6 +1520,22 @@ int pci_add_dynid(struct pci_driver *drv,
@@ -1522,6 +1522,22 @@ int pci_add_dynid(struct pci_driver *drv,
unsigned long driver_data);
const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
struct pci_dev *dev);
@ -2533,10 +2533,10 @@ index 5984d0d550b4..e01d28e48d9c 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
index 77a4318a6043..3ea2fae046d2 100644
index 1fb5f313d18f..c164f0e87e14 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1702,7 +1702,7 @@ config AIO
@@ -1711,7 +1711,7 @@ config AIO
this option saves about 7k.
config IO_URING
@ -2558,7 +2558,7 @@ index 10ef068f598d..d7953f0ee28a 100644
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index e3fcdc9836a6..8fe91708d600 100644
index adc83cb82f37..945c0704dd27 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -26,6 +26,7 @@
@ -2606,10 +2606,10 @@ index e3fcdc9836a6..8fe91708d600 100644
}
diff --git a/kernel/module/main.c b/kernel/module/main.c
index 4ac3fe43e6c8..5b2604d7e2a7 100644
index d3be89de706d..edcbe5ccf502 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -521,6 +521,7 @@ static struct module_attribute modinfo_##field = { \
@@ -522,6 +522,7 @@ static struct module_attribute modinfo_##field = { \
MODINFO_ATTR(version);
MODINFO_ATTR(srcversion);
@ -2617,7 +2617,7 @@ index 4ac3fe43e6c8..5b2604d7e2a7 100644
static struct {
char name[MODULE_NAME_LEN + 1];
@@ -968,6 +969,7 @@ struct module_attribute *modinfo_attrs[] = {
@@ -969,6 +970,7 @@ struct module_attribute *modinfo_attrs[] = {
&module_uevent,
&modinfo_version,
&modinfo_srcversion,
@ -2921,7 +2921,7 @@ index efff8078e395..1b4f8306cea6 100644
ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
if (ret >= sizeof(fname)) {
diff --git a/scripts/tags.sh b/scripts/tags.sh
index e137cf15aae9..2ed2341f7967 100755
index ea31640b2671..2a08b8f8a380 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -16,6 +16,8 @@ fi
@ -2931,8 +2931,8 @@ index e137cf15aae9..2ed2341f7967 100755
+# RHEL tags and cscope should also ignore redhat/rpm
+ignore="$ignore ( -path redhat/rpm ) -prune -o"
# Use make KBUILD_ABS_SRCTREE=1 {tags|cscope}
# to force full paths for a non-O= build
# ignore arbitrary directories
if [ -n "${IGNORE_DIRS}" ]; then
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
index d1fdd113450a..182e8090cfe8 100644
--- a/security/integrity/platform_certs/load_uefi.c