summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog3
-rw-r--r--kernel-aarch64-debug-rhel.config7
-rw-r--r--kernel-aarch64-rhel.config7
-rw-r--r--kernel-ppc64le-debug-rhel.config4
-rw-r--r--kernel-ppc64le-rhel.config4
-rw-r--r--kernel-s390x-debug-rhel.config7
-rw-r--r--kernel-s390x-rhel.config7
-rw-r--r--kernel-s390x-zfcpdump-rhel.config7
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rw-r--r--kernel-x86_64-rhel.config4
-rwxr-xr-xkernel.spec22
-rw-r--r--patch-5.13.0-redhat.patch84
-rw-r--r--sources6
14 files changed, 133 insertions, 35 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 5acae9995..a50c7140f 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 40
+RHEL_RELEASE = 42
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index e65eee46a..1cb1b8ce0 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/75a7840b5a3793c11a241e00f7b01c088d25017b
+ 75a7840b5a3793c11a241e00f7b01c088d25017b Revert "powerpc: Switch to relative jump labels"
+
https://gitlab.com/cki-project/kernel-ark/-/commit/9ecb01bae94e7379d2da1b5e375241ea3b40ff3b
9ecb01bae94e7379d2da1b5e375241ea3b40ff3b bpf: Fix unprivileged_bpf_disabled setup
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 2b99bbea0..d584f606c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2214,6 +2214,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
CONFIG_IKHEADERS=m
CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
CONFIG_IMA_APPRAISE_MODSIG=y
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
CONFIG_IMA_APPRAISE=y
@@ -2223,7 +2224,7 @@ CONFIG_IMA_APPRAISE=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2359,7 +2360,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
@@ -2767,7 +2768,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
CONFIG_LEDS_CLASS_FLASH=m
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 4f1ee214e..e534259c5 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2198,6 +2198,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
CONFIG_IKHEADERS=m
CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
CONFIG_IMA_APPRAISE_MODSIG=y
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
CONFIG_IMA_APPRAISE=y
@@ -2207,7 +2208,7 @@ CONFIG_IMA_APPRAISE=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2343,7 +2344,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
@@ -2747,7 +2748,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
CONFIG_LEDS_CLASS_FLASH=m
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index b0e09524d..e965230f0 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2065,7 +2065,7 @@ CONFIG_IMA_ARCH_POLICY=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2614,7 +2614,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 501d185bc..c84a287a7 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2049,7 +2049,7 @@ CONFIG_IMA_ARCH_POLICY=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2597,7 +2597,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index dda2226a7..b4da5ee56 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2038,6 +2038,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
CONFIG_IKHEADERS=m
CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
CONFIG_IMA_APPRAISE_MODSIG=y
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
CONFIG_IMA_APPRAISE=y
@@ -2047,7 +2048,7 @@ CONFIG_IMA_APPRAISE=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2182,7 +2183,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
@@ -2589,7 +2590,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index c5502f0b4..3f68905ea 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2022,6 +2022,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
CONFIG_IKHEADERS=m
CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
CONFIG_IMA_APPRAISE_MODSIG=y
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
CONFIG_IMA_APPRAISE=y
@@ -2031,7 +2032,7 @@ CONFIG_IMA_APPRAISE=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2166,7 +2167,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
@@ -2572,7 +2573,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 276c819ca..58f0eef84 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2036,6 +2036,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_IKCONFIG is not set
# CONFIG_IKHEADERS is not set
CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
CONFIG_IMA_APPRAISE_MODSIG=y
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
CONFIG_IMA_APPRAISE=y
@@ -2045,7 +2046,7 @@ CONFIG_IMA_APPRAISE=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2184,7 +2185,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
@@ -2590,7 +2591,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index bb3e962f7..c9a767cd4 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2209,7 +2209,7 @@ CONFIG_IMA_ARCH_POLICY=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2793,7 +2793,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index cb2828370..23c834d13 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2193,7 +2193,7 @@ CONFIG_IMA_ARCH_POLICY=y
CONFIG_IMA_DEFAULT_HASH="sha256"
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_KEXEC is not set
+CONFIG_IMA_KEXEC=y
# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
CONFIG_IMA_LOAD_X509=y
CONFIG_IMA_LSM_RULES=y
@@ -2774,7 +2774,7 @@ CONFIG_LDISC_AUTOLOAD=y
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_BLINK is not set
CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
# CONFIG_LEDS_CLASS_FLASH is not set
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
CONFIG_LEDS_CLASS=y
diff --git a/kernel.spec b/kernel.spec
index 10256b95e..900860fec 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc5.20210610gitcd1245d75ce9.40
+%global distro_build 0.rc5.20210611git929d931f2b40.42
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -119,13 +119,13 @@ Summary: The Linux kernel
%define kversion 5.13
%define rpmversion 5.13.0
-%define pkgrelease 0.rc5.20210610gitcd1245d75ce9.40
+%define pkgrelease 0.rc5.20210611git929d931f2b40.42
# This is needed to do merge window version magic
%define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20210610gitcd1245d75ce9.40%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210611git929d931f2b40.42%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -652,7 +652,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc5-63-gcd1245d75ce9.tar.xz
+Source0: linux-5.13-rc5-110-g929d931f2b40.tar.xz
Source1: Makefile.rhelver
@@ -1321,8 +1321,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.13-rc5-63-gcd1245d75ce9 -c
-mv linux-5.13-rc5-63-gcd1245d75ce9 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc5-110-g929d931f2b40 -c
+mv linux-5.13-rc5-110-g929d931f2b40 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2879,7 +2879,8 @@ fi
#
#
%changelog
-* Thu Jun 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210610gitcd1245d75ce9.40]
+* Fri Jun 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210611git929d931f2b40.42]
+- Revert "powerpc: Switch to relative jump labels" (Don Zickus)
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
@@ -2916,6 +2917,13 @@ fi
- configs/common: disable CONFIG_INIT_STACK_ALL_{PATTERN,ZERO} (Philipp Rudo)
- configs/common/aarch64: disable CONFIG_RELR (Philipp Rudo)
+* Fri Jun 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210611git929d931f2b40.41]
+- redhat/configs: enable IMA_KEXEC for supported arches (Bruno Meneguele)
+- redhat/configs: enable INTEGRITY_SIGNATURE to all arches (Bruno Meneguele)
+
+* Fri Jun 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210611git06af8679449d.40]
+- configs: enable CONFIG_LEDS_BRIGHTNESS_HW_CHANGED (Benjamin Tissoires)
+
* Sat Jun 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210604gitf88cd3fb9df2.36]
- RHEL: disable io_uring support (Jeff Moyer)
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch
index 82356366b..e98727316 100644
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@@ -6,6 +6,9 @@
arch/arm/Kconfig | 4 +-
arch/arm64/Kconfig | 3 +-
arch/arm64/kernel/acpi.c | 4 +
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/include/asm/jump_label.h | 21 +-
+ arch/powerpc/kernel/jump_label.c | 4 +-
arch/s390/include/asm/ipl.h | 1 +
arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 +
@@ -70,7 +73,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 72 files changed, 1215 insertions(+), 189 deletions(-)
+ 75 files changed, 1232 insertions(+), 198 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -238,6 +241,85 @@ index cada0b816c8a..77b30bf451aa 100644
static bool param_acpi_force __initdata;
static int __init parse_acpi(char *arg)
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 088dd2afcfe4..59e0d55ee01d 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -189,7 +189,6 @@ config PPC
+ select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP
+ select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU
+ select HAVE_ARCH_JUMP_LABEL
+- select HAVE_ARCH_JUMP_LABEL_RELATIVE
+ select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14
+ select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14
+ select HAVE_ARCH_KFENCE if PPC32
+diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
+index 2d5c6bec2b4f..09297ec9fa52 100644
+--- a/arch/powerpc/include/asm/jump_label.h
++++ b/arch/powerpc/include/asm/jump_label.h
+@@ -20,8 +20,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
+ asm_volatile_goto("1:\n\t"
+ "nop # arch_static_branch\n\t"
+ ".pushsection __jump_table, \"aw\"\n\t"
+- ".long 1b - ., %l[l_yes] - .\n\t"
+- JUMP_ENTRY_TYPE "%c0 - .\n\t"
++ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
+ ".popsection \n\t"
+ : : "i" (&((char *)key)[branch]) : : l_yes);
+
+@@ -35,8 +34,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
+ asm_volatile_goto("1:\n\t"
+ "b %l[l_yes] # arch_static_branch_jump\n\t"
+ ".pushsection __jump_table, \"aw\"\n\t"
+- ".long 1b - ., %l[l_yes] - .\n\t"
+- JUMP_ENTRY_TYPE "%c0 - .\n\t"
++ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
+ ".popsection \n\t"
+ : : "i" (&((char *)key)[branch]) : : l_yes);
+
+@@ -45,12 +43,23 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
+ return true;
+ }
+
++#ifdef CONFIG_PPC64
++typedef u64 jump_label_t;
++#else
++typedef u32 jump_label_t;
++#endif
++
++struct jump_entry {
++ jump_label_t code;
++ jump_label_t target;
++ jump_label_t key;
++};
++
+ #else
+ #define ARCH_STATIC_BRANCH(LABEL, KEY) \
+ 1098: nop; \
+ .pushsection __jump_table, "aw"; \
+- .long 1098b - ., LABEL - .; \
+- FTR_ENTRY_LONG KEY; \
++ FTR_ENTRY_LONG 1098b, LABEL, KEY; \
+ .popsection
+ #endif
+
+diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c
+index ce87dc5ea23c..144858027fa3 100644
+--- a/arch/powerpc/kernel/jump_label.c
++++ b/arch/powerpc/kernel/jump_label.c
+@@ -11,10 +11,10 @@
+ void arch_jump_label_transform(struct jump_entry *entry,
+ enum jump_label_type type)
+ {
+- struct ppc_inst *addr = (struct ppc_inst *)jump_entry_code(entry);
++ struct ppc_inst *addr = (struct ppc_inst *)(unsigned long)entry->code;
+
+ if (type == JUMP_LABEL_JMP)
+- patch_branch(addr, jump_entry_target(entry), 0);
++ patch_branch(addr, entry->target, 0);
+ else
+ patch_instruction(addr, ppc_inst(PPC_INST_NOP));
+ }
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index a9e2c7295b35..6ff11f3a2d47 100644
--- a/arch/s390/include/asm/ipl.h
diff --git a/sources b/sources
index 60fffe3e5..ce03ddf2e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc5-63-gcd1245d75ce9.tar.xz) = 2d54d63097eb62f85d6630a44bf2e1f7c7e3190a90309648aaa3fd8c6549a3cfd2fc0018b4dbe08e0bd139ec3bfa3f44423b773145e29dcd759f790055b325ef
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.tar.bz2) = 989a32f00d2139f3547dd58bb012f7cb28752e82367a7d8039e503dbdc272c87923276b02728c2e28a40e12198ccc84be76d221159eab4a47d1f6db292ca7bc4
-SHA512 (kernel-kabi-dw-5.13.0-0.rc5.20210610gitcd1245d75ce9.40.tar.bz2) = 3177f38d555e65042bf7c4db4c55913beeef1793c21bdf204f26f486d1c5a2603eb2c091179c42f7657b54a9a3944e9410030c13be0b7e1feb16271fca3ea0d4
+SHA512 (linux-5.13-rc5-110-g929d931f2b40.tar.xz) = 98e11913844f92ff8c1e73e6ee831f8ab51f31f1b6e05f177dd3fa451aefd7befb391a433b46bda5d45bc72fde1705db5b352deff5756293d5dc11c0efdea3b8
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.20210611git929d931f2b40.42.tar.bz2) = 8ca79564738d1b40bbd28e9607c4e596c3f64407c7e3ee3d16707ef63d39ddb1cad5c9adc07bd14bda5fc606d60089cd79dbd0bb7cb8d5ac0a0c68964ed111f0
+SHA512 (kernel-kabi-dw-5.13.0-0.rc5.20210611git929d931f2b40.42.tar.bz2) = 0cad462500c3af23174411de846badbf06b4d61a9a1fbf07dae6b7a199be3afd9913e264952dca947ff7a999e75c48b9c43c9dbc1987a8a7f3cab78c6b693024
generated by cgit (git 2.34.1) at 2024-11-15 12:11:41 +0000