summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-09 10:06:34 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-09 10:06:34 -0500
commitf70c5100799fd072342b834082b35e1edb831747 (patch)
tree202ee197f1d7da170ddcc5d7ff5d57e631cd4227
parent380d6c25863b5edd89b68cda24e0f4dfae5cbc25 (diff)
downloadkernel-f70c5100799fd072342b834082b35e1edb831747.zip
kernel-f70c5100799fd072342b834082b35e1edb831747.tar.gz
kernel-f70c5100799fd072342b834082b35e1edb831747.tar.xz
kernel-5.14.0-0.rc0.20210709gitf55966571d5e.14
* Fri Jul 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210709gitf55966571d5e.14] - Fix the perf trace link location (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog7
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config3
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config3
-rw-r--r--kernel-s390x-zfcpdump-rhel.config3
-rw-r--r--kernel-x86_64-debug-rhel.config3
-rw-r--r--kernel-x86_64-rhel.config3
-rwxr-xr-xkernel.spec18
-rw-r--r--patch-5.14.0-redhat.patch67
-rw-r--r--sources6
12 files changed, 32 insertions, 85 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 18afd01..e4f22ec 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 = 13
+RHEL_RELEASE = 14
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index d9f61b6..c2ce1f5 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,8 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/eeeb30f378c606dff8ef7823e6ab0af0f041657f
- eeeb30f378c606dff8ef7823e6ab0af0f041657f Fix the perf trace link location
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3cecd9812d297c5653678c5e84e2a9ab9daf4819
- 3cecd9812d297c5653678c5e84e2a9ab9daf4819 drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64
+https://gitlab.com/cki-project/kernel-ark/-/commit/6f5d7fac6e5ad971605ac27a4fb92940d95406b4
+ 6f5d7fac6e5ad971605ac27a4fb92940d95406b4 Fix the perf trace link location
https://gitlab.com/cki-project/kernel-ark/-/commit/c86a777b719e3777a9663a13a739840fb48a20ef
c86a777b719e3777a9663a13a739840fb48a20ef Revert "kdump: add support for crashkernel=auto"
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 9f72042..96823ac 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2800,6 +2800,7 @@ CONFIG_KERNEL_HEADER_TEST=y
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KEXEC_FILE=y
CONFIG_KEXEC_IMAGE_VERIFY_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index a955351..e56817a 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2526,7 +2526,8 @@ CONFIG_KERNEL_HEADER_TEST=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index db1b8c0..fceaaff 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2778,6 +2778,7 @@ CONFIG_KERNEL_HEADER_TEST=y
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KEXEC_FILE=y
CONFIG_KEXEC_IMAGE_VERIFY_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 7150dbd..d0e9f60 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2509,7 +2509,8 @@ CONFIG_KERNEL_HEADER_TEST=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 0307e41..40575d4 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2527,7 +2527,8 @@ CONFIG_KERNEL_HEADER_TEST=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_ZSTD is not set
CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 2dafd6d..37be326 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2725,7 +2725,8 @@ CONFIG_KERNEL_HEADER_TEST=y
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
CONFIG_KEXEC_FILE=y
CONFIG_KEXEC_JUMP=y
-# CONFIG_KEXEC_SIG is not set
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 7648e5a..2f15e1a 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2706,7 +2706,8 @@ CONFIG_KERNEL_HEADER_TEST=y
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
CONFIG_KEXEC_FILE=y
CONFIG_KEXEC_JUMP=y
-# CONFIG_KEXEC_SIG is not set
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_SIG=y
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
diff --git a/kernel.spec b/kernel.spec
index 9af9343..855c21a 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.20210708gite9f1cbc0c411.13
+%global distro_build 0.rc0.20210709gitf55966571d5e.14
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -117,13 +117,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc0.20210708gite9f1cbc0c411.13
+%define pkgrelease 0.rc0.20210709gitf55966571d5e.14
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20210708gite9f1cbc0c411.13%{?buildid}%{?dist}
+%define specrelease 0.rc0.20210709gitf55966571d5e.14%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -655,7 +655,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-12185-ge9f1cbc0c411.tar.xz
+Source0: linux-5.13-12377-gf55966571d5e.tar.xz
Source1: Makefile.rhelver
@@ -1340,8 +1340,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.13-12185-ge9f1cbc0c411 -c
-mv linux-5.13-12185-ge9f1cbc0c411 linux-%{KVERREL}
+%setup -q -n kernel-5.13-12377-gf55966571d5e -c
+mv linux-5.13-12377-gf55966571d5e linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2922,9 +2922,11 @@ fi
#
#
%changelog
-* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.13]
+* Fri Jul 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210709gitf55966571d5e.14]
- Fix the perf trace link location (Justin M. Forbes)
-- drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 (Michal Suchanek)
+
+* Fri Jul 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210709gitf55966571d5e.13]
+- redhat/configs: enable KEXEC_SIG which is already enabled in RHEL8 for s390x and x86_64 (Coiby Xu) [1976835]
* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.12]
- rpmspec: do not BuildRequires bpftool on noarch (Herton R. Krzesinski)
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index b828764..dbed011 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -20,7 +20,6 @@
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 +++--
drivers/firmware/efi/secureboot.c | 38 ++
- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +
drivers/hid/hid-rmi.c | 64 ---
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +
drivers/infiniband/sw/rxe/rxe.c | 2 +
@@ -34,7 +33,6 @@
drivers/nvme/host/core.c | 22 +-
drivers/nvme/host/multipath.c | 19 +-
drivers/nvme/host/nvme.h | 4 +
- drivers/pci/controller/pcie-rockchip-host.c | 12 +-
drivers/pci/pci-driver.c | 29 ++
drivers/pci/quirks.c | 24 +
drivers/scsi/aacraid/linit.c | 2 +
@@ -86,7 +84,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 88 files changed, 1188 insertions(+), 1500 deletions(-)
+ 86 files changed, 1180 insertions(+), 1494 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bdb22006f713..61a3a4a4730b 100644
@@ -792,26 +790,6 @@ index 000000000000..de0a3714a5d4
+ }
+ }
+}
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
-index 5dcdc5a858fe..4bab97acb155 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile
-@@ -28,6 +28,7 @@ endif
- CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o += -mhard-float
- endif
-
-+ifdef CONFIG_X86
- ifdef IS_OLD_GCC
- # Stack alignment mismatch, proceed with caution.
- # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
-@@ -36,6 +37,7 @@ CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o += -mpreferred-stack-boundary=4
- else
- CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o += -msse2
- endif
-+endif
-
- AMD_DAL_DCN31 = $(addprefix $(AMDDALPATH)/dc/dcn31/,$(DCN31))
-
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 311eee599ce9..2460c6bd46f8 100644
--- a/drivers/hid/hid-rmi.c
@@ -1471,43 +1449,6 @@ index 75420ceacc10..617e130e9377 100644
static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
{
}
-diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
-index f1d08a1b1591..78d04ac29cd5 100644
---- a/drivers/pci/controller/pcie-rockchip-host.c
-+++ b/drivers/pci/controller/pcie-rockchip-host.c
-@@ -592,10 +592,6 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
- if (err)
- return err;
-
-- err = rockchip_pcie_setup_irq(rockchip);
-- if (err)
-- return err;
--
- rockchip->vpcie12v = devm_regulator_get_optional(dev, "vpcie12v");
- if (IS_ERR(rockchip->vpcie12v)) {
- if (PTR_ERR(rockchip->vpcie12v) != -ENODEV)
-@@ -973,8 +969,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
- if (err)
- goto err_vpcie;
-
-- rockchip_pcie_enable_interrupts(rockchip);
--
- err = rockchip_pcie_init_irq_domain(rockchip);
- if (err < 0)
- goto err_deinit_port;
-@@ -992,6 +986,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
- bridge->sysdata = rockchip;
- bridge->ops = &rockchip_pcie_ops;
-
-+ err = rockchip_pcie_setup_irq(rockchip);
-+ if (err)
-+ goto err_remove_irq_domain;
-+
-+ rockchip_pcie_enable_interrupts(rockchip);
-+
- err = pci_host_probe(bridge);
- if (err < 0)
- goto err_remove_irq_domain;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 3a72352aa5cf..47b11f3c7fce 100644
--- a/drivers/pci/pci-driver.c
@@ -1556,10 +1497,10 @@ index 3a72352aa5cf..47b11f3c7fce 100644
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 22b2bb1109c9..2131ee5ab7fd 100644
+index 6d74386eadc2..2333c1e4ae05 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -4219,6 +4219,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4230,6 +4230,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
quirk_bridge_cavm_thrx2_pcie_root);
@@ -2055,7 +1996,7 @@ index f5844908a089..901d51012738 100644
struct taint_flag {
diff --git a/include/linux/pci.h b/include/linux/pci.h
-index eb45078abc3a..5f88ca707c7e 100644
+index 540b377ca8f6..eb21f6dfb846 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1433,6 +1433,10 @@ int pci_add_dynid(struct pci_driver *drv,
diff --git a/sources b/sources
index 328856c..20aabd5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.13-12185-ge9f1cbc0c411.tar.xz) = baef008a3705ca8ea3dc94a3e003167f4556c948c4a6042ce034f26432ab5fe7a64b0dd8269ed514cc615ad4d07fd47aa4bd98c3f00c18816f59de1afd7eff82
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc0.20210708gite9f1cbc0c411.13.tar.bz2) = 01ce46a50420619e13e5dc973e4720e9ee56d73c9c1231099086b02d2d9fd649839d398c3a02a715c5a1aaaf1b276368ec84e768b7e97391d9317c11247bd0f0
-SHA512 (kernel-kabi-dw-5.14.0-0.rc0.20210708gite9f1cbc0c411.13.tar.bz2) = aa8f8739b61d4a3550d0d96eab11baea8ac9f93ab8b4fd00e37e9201932d8f5174c0e952fea04072addae1394ae44e1e678d097a9e034cc4ab9256ac37e1eafa
+SHA512 (linux-5.13-12377-gf55966571d5e.tar.xz) = e39989d263e5b77eb1086d9366aaa3bcff95dffd783d64ac1fedc5671bef7a7a3f183dbda13c71938280df441197f26de9168a0b8100d4df03307bdc71481302
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc0.20210709gitf55966571d5e.14.tar.bz2) = fb68973d091eee14488efcd10c50721ae05c9d5dcb3b2554c5a4d3ffc0c0eea16e716c787b2dd28b614f1ee5f9f237da0a48c64ab2bd6e9d025b4fee91bbcfad
+SHA512 (kernel-kabi-dw-5.14.0-0.rc0.20210709gitf55966571d5e.14.tar.bz2) = 09984360fed897bf17ce3b2ed2e59e153310ac5affd917576607a221ce357ecfa217d418473adcb58254aabbc4873b13071be946eda9f05ffabf6fb7290c56fe