rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.2.0-0.rc4.31

Browse Source 
* Mon Jan 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.31]
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-01-16 09:23:56 -06:00
parent 4b31e4ca50
commit 900987e1d3
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
25 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 28
RHEL_RELEASE = 31
#
# ZSTREAM

2
kernel-aarch64-debug-fedora.config
View File

@ -7389,7 +7389,7 @@ CONFIG_SND_SOC_MSM8996=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-aarch64-debug-rhel.config
View File

@ -5859,7 +5859,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-aarch64-fedora.config
View File

@ -7367,7 +7367,7 @@ CONFIG_SND_SOC_MSM8996=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-aarch64-rhel.config
View File

@ -5835,7 +5835,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-armv7hl-debug-fedora.config
View File

@ -7414,7 +7414,7 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-armv7hl-fedora.config
View File

@ -7394,7 +7394,7 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -7220,7 +7220,7 @@ CONFIG_SND_SOC_MESON_T9015=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-armv7hl-lpae-fedora.config
View File

@ -7200,7 +7200,7 @@ CONFIG_SND_SOC_MESON_T9015=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-ppc64le-debug-fedora.config
View File

@ -6223,7 +6223,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-ppc64le-debug-rhel.config
View File

@ -5611,7 +5611,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-ppc64le-fedora.config
View File

@ -6201,7 +6201,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-ppc64le-rhel.config
View File

@ -5589,7 +5589,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-s390x-debug-fedora.config
View File

@ -6167,7 +6167,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-s390x-debug-rhel.config
View File

@ -5588,7 +5588,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-s390x-fedora.config
View File

@ -6145,7 +6145,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-s390x-rhel.config
View File

@ -5566,7 +5566,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-s390x-zfcpdump-rhel.config
View File

@ -5586,7 +5586,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_NAU8821 is not set

2
kernel-x86_64-debug-fedora.config
View File

@ -6595,7 +6595,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
CONFIG_SND_SOC_NAU8540=m
# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_NAU8821=m

2
kernel-x86_64-debug-rhel.config
View File

@ -5818,7 +5818,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_NAU8821=m

2
kernel-x86_64-fedora.config
View File

@ -6574,7 +6574,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
CONFIG_SND_SOC_NAU8540=m
# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_NAU8821=m

2
kernel-x86_64-rhel.config
View File

@ -5795,7 +5795,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_MT6358 is not set
# CONFIG_SND_SOC_MT6660 is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_NAU8315 is not set
CONFIG_SND_SOC_NAU8315=m
# CONFIG_SND_SOC_NAU8540 is not set
# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_NAU8821=m

19
kernel.spec
View File

@ -122,17 +122,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.2.0
%define patchversion 6.2
%define pkgrelease 0.rc3.20230113gitd9fc1511728c.28
%define pkgrelease 0.rc4.31
%define kversion 6
%define tarfile_release 6.2-rc3-165-gd9fc1511728c
%define tarfile_release 6.2-rc4
# This is needed to do merge window version magic
%define patchlevel 2
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20230113gitd9fc1511728c.28%{?buildid}%{?dist}
%define specrelease 0.rc4.31%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.2.0
@ -3179,9 +3179,18 @@ fi
#
#
%changelog
* Fri Jan 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.d9fc1511728c.28]
* Mon Jan 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.31]
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
* Mon Jan 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.30]
- Linux v6.2.0-0.rc4
* Sun Jan 15 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.7c6984405241.29]
- Linux v6.2.0-0.rc3.7c6984405241
* Sat Jan 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.97ec4d559d93.28]
- Linux v6.2.0-0.rc3.97ec4d559d93
* Fri Jan 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.d9fc1511728c.27]
- kernel/rh_messages.c: gcc12 warning on redundant NULL test (Eric Chanudet) [2142658]
- Linux v6.2.0-0.rc3.d9fc1511728c

18
patch-6.2-redhat.patch
View File

@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
index 460716314fb3..7b76828602d2 100644
index e09fe100efb2..6479d94cdbcc 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -166,10 +166,10 @@ index 43c7773b89ae..2c1db1cb5528 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 03934808b2ed..2511d5330ece 100644
index c5ccca26a408..4cacdb4ab764 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1220,7 +1220,7 @@ endchoice
@@ -1234,7 +1234,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@ -178,7 +178,7 @@ index 03934808b2ed..2511d5330ece 100644
help
For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs
@@ -1459,6 +1459,7 @@ config XEN
@@ -1473,6 +1473,7 @@ config XEN
config ARCH_FORCE_MAX_ORDER
int
default "14" if ARM64_64K_PAGES
@ -438,10 +438,10 @@ index c2c786eb95ab..4e3aa80cd5cf 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 274344434282..71671f258345 100644
index 0c6f06abe3f4..f66b85b2c108 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1743,6 +1743,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
@@ -1746,6 +1746,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
return false;
@ -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 09716eebe8ac..dcc10a1cdf96 100644
index a2b0cbc8741c..8bc96fa10b8f 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@ -571,7 +571,7 @@ index 09716eebe8ac..dcc10a1cdf96 100644
#include <asm/early_ioremap.h>
@@ -904,40 +905,101 @@ int efi_mem_type(unsigned long phys_addr)
@@ -907,40 +908,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 de91dd88705b..9fef6c8e3341 100644
index 5f6a85aea501..3b1e9faa9c2d 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.2-rc3-165-gd9fc1511728c.tar.xz) = 5553af0b3461a0cb3d30cacbbe0f60103bd2cd0c1dd91f276ed86a3b625ccc5723582a54e7c698fc9ecaed7f2ae0d75a70c9c7fadd214a86daf9c8b31b3d6074
SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 972debd4a1064d132e2cf289bea7425d67bf977854649c473d0de384c0ce828a2fbaeb7d3f9695f8717cae41dbd3312f4582b5efd1c3396b6283d1c7221374e3
SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0b5a4b7644e03fe3e6517f990bd68d9549a897d33f3641db96dd1840acd6b43453e14e73e49f11b55b950d95de1e68d6da2187aabdc47da79bec51d02516aeff
SHA512 (linux-6.2-rc4.tar.xz) = 93ca7c05cba7e58f0b1b6d01b456dfe886c0983fb595ec0cfe2053812ca50bd06827e3abd1d27b13efdc0332e4b3f56097a1e02458907154f77d9a4a738e316c
SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = aa5fa056d61693425f10a12ff4972b9e54e0830473e410316d6dc71cd6379c7c24dc8ef9383e9c4ac7dfd50eb72091c50fe5ed7821f082d40751ce4609631764
SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 26eb6ba82fefd323efef409627c0413d6275fdc174ad1fa4bfd31e1bc61a10c03182a0cefd5ebb41df87feb04af5b7759a5eb23cc81943fbd341018d3dcd21d2