kernel-6.1.0-0.rc2.21
* Mon Oct 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.21] - perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
036a7ad18b
commit
e25e6e997d
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 17
|
||||
RHEL_RELEASE = 21
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8b1b0f775cff7f5dc36cc1edf61e3e3971a25059
|
||||
8b1b0f775cff7f5dc36cc1edf61e3e3971a25059 perf tools: Fix man page build wrt perf-arm-coresight.txt
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/cd37e50d142e792867e204b7dca20a64334739cd
|
||||
cd37e50d142e792867e204b7dca20a64334739cd perf tools: Fix man page build wrt perf-arm-coresight.txt
|
||||
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074
|
||||
a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
|
||||
|
||||
@ -6271,7 +6271,7 @@ CONFIG_TEST_BPF=m
|
||||
# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
|
||||
CONFIG_TEST_CPUMASK=m
|
||||
# CONFIG_TEST_DIV64 is not set
|
||||
# CONFIG_TEST_DYNAMIC_DEBUG is not set
|
||||
CONFIG_TEST_DYNAMIC_DEBUG=m
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
CONFIG_TEST_FPU=m
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
|
||||
@ -6025,7 +6025,7 @@ CONFIG_TEST_BPF=m
|
||||
# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
|
||||
CONFIG_TEST_CPUMASK=m
|
||||
# CONFIG_TEST_DIV64 is not set
|
||||
# CONFIG_TEST_DYNAMIC_DEBUG is not set
|
||||
CONFIG_TEST_DYNAMIC_DEBUG=m
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
CONFIG_TEST_FPU=m
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
|
||||
@ -5998,7 +5998,7 @@ CONFIG_TEST_BPF=m
|
||||
# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
|
||||
CONFIG_TEST_CPUMASK=m
|
||||
# CONFIG_TEST_DIV64 is not set
|
||||
# CONFIG_TEST_DYNAMIC_DEBUG is not set
|
||||
CONFIG_TEST_DYNAMIC_DEBUG=m
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
CONFIG_TEST_FPU=m
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
|
||||
@ -6244,7 +6244,7 @@ CONFIG_TEST_BPF=m
|
||||
# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
|
||||
CONFIG_TEST_CPUMASK=m
|
||||
# CONFIG_TEST_DIV64 is not set
|
||||
# CONFIG_TEST_DYNAMIC_DEBUG is not set
|
||||
CONFIG_TEST_DYNAMIC_DEBUG=m
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
CONFIG_TEST_FPU=m
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
|
||||
22
kernel.spec
22
kernel.spec
@ -119,17 +119,17 @@ Summary: The Linux kernel
|
||||
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
|
||||
# to build the base kernel using the debug configuration. (Specifying
|
||||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 0
|
||||
%define debugbuildsenabled 1
|
||||
# define buildid .local
|
||||
%define specversion 6.1.0
|
||||
%define patchversion 6.1
|
||||
%define pkgrelease 0.rc1.20221019gitaae703b02f92.17
|
||||
%define pkgrelease 0.rc2.21
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.1-rc1-25-gaae703b02f92
|
||||
%define tarfile_release 6.1-rc2
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 1
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc1.20221019gitaae703b02f92.17%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc2.21%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.1.0
|
||||
|
||||
@ -3190,9 +3190,21 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Oct 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.aae703b02f92.17]
|
||||
* Mon Oct 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.21]
|
||||
- perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter)
|
||||
|
||||
* Mon Oct 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.20]
|
||||
- Linux v6.1.0-0.rc2
|
||||
|
||||
* Sun Oct 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.d47136c28015.19]
|
||||
- Linux v6.1.0-0.rc1.d47136c28015
|
||||
|
||||
* Sat Oct 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.4da34b7d175d.18]
|
||||
- Linux v6.1.0-0.rc1.4da34b7d175d
|
||||
|
||||
* Fri Oct 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.e35184f32151.17]
|
||||
- Linux v6.1.0-0.rc1.e35184f32151
|
||||
|
||||
* Wed Oct 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.aae703b02f92.16]
|
||||
- Adjust FIPS module name in RHEL (Vladis Dronov)
|
||||
- spec: prevent git apply from searching for the .git directory (Ondrej Mosnacek)
|
||||
|
||||
@ -122,7 +122,7 @@ index 000000000000..effb81d04bfd
|
||||
+
|
||||
+endmenu
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f41ec8c8426b..4781baaf709c 100644
|
||||
index d148a55bfd0f..35f9d1dfa080 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
@ -440,10 +440,10 @@ index 1cc4647f78b8..016d488cabc3 100644
|
||||
return ctx.rc;
|
||||
}
|
||||
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
||||
index 558664d169fc..8510440fa17e 100644
|
||||
index 024cc373a197..99369d9cac17 100644
|
||||
--- a/drivers/acpi/scan.c
|
||||
+++ b/drivers/acpi/scan.c
|
||||
@@ -1741,6 +1741,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
||||
@@ -1742,6 +1742,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
||||
if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
|
||||
return false;
|
||||
|
||||
@ -562,7 +562,7 @@ index 8d151e332584..bd29fe4ddbf3 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 9624735f1575..d4faa8835096 100644
|
||||
index 3ecdc43a3f2b..c856ef768c2a 100644
|
||||
--- a/drivers/firmware/efi/efi.c
|
||||
+++ b/drivers/firmware/efi/efi.c
|
||||
@@ -32,6 +32,7 @@
|
||||
@ -573,7 +573,7 @@ index 9624735f1575..d4faa8835096 100644
|
||||
|
||||
#include <asm/early_ioremap.h>
|
||||
|
||||
@@ -879,40 +880,101 @@ int efi_mem_type(unsigned long phys_addr)
|
||||
@@ -881,40 +882,101 @@ int efi_mem_type(unsigned long phys_addr)
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -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 4893c2429ca5..45c2e48c82d6 100644
|
||||
index 65a3b3d886dc..911b64ce9889 100644
|
||||
--- a/drivers/iommu/iommu.c
|
||||
+++ b/drivers/iommu/iommu.c
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -1105,7 +1105,7 @@ index 4893c2429ca5..45c2e48c82d6 100644
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/bits.h>
|
||||
#include <linux/bug.h>
|
||||
@@ -2817,6 +2818,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
|
||||
@@ -2818,6 +2819,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
|
||||
|
||||
@ -1228,7 +1228,7 @@ index ee4da9ab8013..d395d11eadc4 100644
|
||||
if (ret < 0)
|
||||
goto err_allowedips;
|
||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||
index 059737c1a2c1..3de14ca20059 100644
|
||||
index dc4220600585..758d2239af64 100644
|
||||
--- a/drivers/nvme/host/core.c
|
||||
+++ b/drivers/nvme/host/core.c
|
||||
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
|
||||
@ -1781,7 +1781,7 @@ index eae288c8d40a..8b8bf447cedc 100644
|
||||
|
||||
error_proc:
|
||||
diff --git a/include/linux/efi.h b/include/linux/efi.h
|
||||
index da3974bf05d3..cd7fad7eef44 100644
|
||||
index 80f3c1c7827d..64cefca233ee 100644
|
||||
--- a/include/linux/efi.h
|
||||
+++ b/include/linux/efi.h
|
||||
@@ -43,6 +43,8 @@
|
||||
@ -1834,7 +1834,7 @@ index da3974bf05d3..cd7fad7eef44 100644
|
||||
|
||||
/*
|
||||
* Variable Attributes
|
||||
@@ -1137,13 +1152,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
|
||||
@@ -1134,13 +1149,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);
|
||||
|
||||
@ -2533,7 +2533,7 @@ index ca1b7109c0db..b947cfbf04c2 100644
|
||||
|
||||
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 694f7c160c9c..9bcc8ce2e79a 100644
|
||||
index abf65098f1b6..533c8e3a633b 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1685,7 +1685,7 @@ config AIO
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-6.1-rc1-25-gaae703b02f92.tar.xz) = 96d040d877d20c15ef6c76dc3634c9e729a1babd0adf986ed09db8be45dd0093f06543c976e40d3aac8155b8ad6528c2e900e58bf75643f10e577fc96e11a431
|
||||
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 869cdc60b855026d7595a919a294464201a31dc24779c2c41022d7df2d6c7f7ac81f00c30e1dd97e3703f3ba7ffa9630dd7205e4f68d65ab23f6c96a878e54a3
|
||||
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = e62d70501709c2f0fa898475959414ba284e6025fb1cdf99a7601df644c6aa6d86972be8ba63937217dbd0081a132e83da9dd8a945e277e496d064a56233ecb1
|
||||
SHA512 (linux-6.1-rc2.tar.xz) = 93146c3cb8033862718394c5cc2fab4feee2ac7e908663035dcecac647b84cbf52690cfb18bb02ad258778f3f4fd6df5cc78607923501750b79e8e65bab0212c
|
||||
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = a71ffa459d07607a0e81892bb1d65aa624c62f09be43695adf56aedb470f84db2a4f6d779fe3e6bc09849def9bae1b8b868e283c3224b28283e9a8bac4c3c69b
|
||||
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = c83758babdb3a32ca1a1db8b5b4c616ccec3023ab5faf5d2fcd467e524e1b823296e946ca006d90edb0b6354759c850a332f4d35286426b9c15644fb0b0b7869
|
||||
|
||||
Loading…
Reference in New Issue
Block a user