summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Drop-that-for-now.patch2
-rw-r--r--0001-put-RHEL-info-into-generated-headers.patch2
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog78
-rw-r--r--kernel.spec42
-rw-r--r--sources6
6 files changed, 117 insertions, 15 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index 5eaf47294..3dcd928eb 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 743ea5749d53..a0b712380d83 100644
+index 53bbe4be5a69..9d060d6f3037 100644
--- a/Makefile
+++ b/Makefile
@@ -497,7 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index bb4a97330..a2afcbf29 100644
--- a/0001-put-RHEL-info-into-generated-headers.patch
+++ b/0001-put-RHEL-info-into-generated-headers.patch
@@ -59,7 +59,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 2b66d3398878..743ea5749d53 100644
+index 992d24467ca0..53bbe4be5a69 100644
--- a/Makefile
+++ b/Makefile
@@ -1245,7 +1245,13 @@ endef
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 350b1c0db..07fdee057 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 = 17
+RHEL_RELEASE = 20
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
new file mode 100644
index 000000000..114c8e952
--- /dev/null
+++ b/Patchlist.changelog
@@ -0,0 +1,78 @@
+d050d59df54ae511abe2749da224fdead503d8eb Filter out LTO build options from the perl ccopts
+ac45397de18ae12a593d9905f45184653778c12c Temporarily remove cdomain from sphinx documentation
+640592428861a423ff76e010ac94c0534604824b Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
+c15af43ddd7d41b4057d0a5b024106ebde0c1638 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only
+c189dfd915d3491c25af95f37b9607cb23d8d408 arch/x86: Remove vendor specific CPU ID checks
+5f3e99d5ea1148a4f116ad25c04755a17ed97d8c redhat: Replace hardware.redhat.com link in Unsupported message
+844d4ff20ee79a738e70186daa6d7fa410d3c9fa x86: Fix compile issues with rh_check_supported()
+8065d66d3d7945d3e764187dbea84f02a8ded75a e1000e: bump up timeout to wait when ME un-configure ULP mode
+8714692ff7c4d29ea19559163f35fa8010bc3a6e drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation
+19b41705110cac0669c07afe12ad111af9ec8ee3 drm: panel: add Xingbangda XBD599 panel
+c6b2c9e3ce1040cb8118cec45475f172a5500399 dt-bindings: panel: add binding for Xingbangda XBD599 panel
+3b3965f1f690e8b6f822d1595c58b2e642cd75cd ARM: fix __get_user_check() in case uaccess_* calls are not inlined
+fe8f04e184269f114b54019da0219fb700c30180 mm/kmemleak: skip late_init if not skip disable
+b3b4264f1c86243abdf152ac3f9fdf9179334f91 KEYS: Make use of platform keyring for module signature verify
+1786643603f8f2764b284883bafff969a5ccbf47 Drop that for now
+3d21988c3fc938c129d11f27305b9204a960d45f Input: rmi4 - remove the need for artificial IRQ in case of HID
+96d54983c9e35cb1b6db02696c3f93d174521b4e ARM: tegra: usb no reset
+7fed090d9758059dc81133eabaf431be489d7bac arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
+70c0c26b9077fbd9fcbe4b7e15b25d8ed2e4a4fc redhat: rh_kabi: deduplication friendly structs
+954c348127aa0a6d9daa8458e06bce6aeab93ac7 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
+8886c73e2b745096d20c3c60dc61da25d3f92238 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
+16df75e4a82d6a4049a285bd35fc7893334ea728 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
+07cff8a43d87f3f4fd6c947a8dbb03629dec7f1b redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
+4cd2c3ac05c76f23a81e8321aad4f711da73e3b6 redhat: rh_kabi: Add macros to size and extend structs
+e7ae8fe482c3f6fdb9f4982e60756ebdc4a706cf Removing Obsolete hba pci-ids from rhel8
+12db34ebe175f7eccddfa7ab10def6bee5e604e1 mptsas: pci-id table changes
+3ef11f1dda218250c91ceebea7e11cd406e4e2d9 mptsas: Taint kernel if mptsas is loaded
+1c75f07f03eee584c99fdb6dc795ca88352aae7b mptspi: pci-id table changes
+08004f7e34bb7d82a49ddeac329fa229dccbeef3 qla2xxx: Remove PCI IDs of deprecated adapter
+e0644bfe2c8da1906ff026b4e5a6c9f6b42a413d be2iscsi: remove unsupported device IDs
+35e989810007a0b154373119ac89a1ecfbebeb15 mptspi: Taint kernel if mptspi is loaded
+b06ab2b263e08ee644e9bc655a5e401e175060b7 hpsa: remove old cciss-based smartarray pci ids
+52423cd02aee7419d201c9181be35a35cbdb0940 qla4xxx: Remove deprecated PCI IDs from RHEL 8
+07ee8a0a019860c0f4394d624eb73d92e2c83137 aacraid: Remove depreciated device and vendor PCI id's
+752d49d3cc795cb108d0324277eb601580cc3f80 megaraid_sas: remove deprecated pci-ids
+8fb0c76365e46b6aa085a12bd803b5b80c189206 mpt*: remove certain deprecated pci-ids
+f30105994c63b739c229a0583291b988435add80 kernel: add SUPPORT_REMOVED kernel taint
+fcefa27f17c1dd32f7a470f9ddae5a58578eb3fd Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
+7995321a6b571e93ed4f6db74ea58503ede740c8 Add option of 13 for FORCE_MAX_ZONEORDER
+64b6406ab965d13d31bdb1dcbb0d6b156bb22432 s390: Lock down the kernel when the IPL secure flag is set
+e2dff8da82a7c54ae73235f12c9fd30815064395 efi: Lock down the kernel if booted in secure boot mode
+51f5608f135bbdfb91820878cf01e81e0973aaec efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
+e1fad39b73243babed5a594ee51e466e7dcfc383 security: lockdown: expose a hook to lock the kernel down
+473a2d149faeff9f58445c9f6f6fb7672d511f29 Make get_cert_list() use efi_status_to_str() to print error messages.
+b35fa09721d651880eee5e7a080494d77b6497ee Add efi_status_to_str() and rework efi_status_to_err().
+bab88142be87711ce284954571c43cd82456e6ee Add support for deprecating processors
+65458b4ce50e2fba43ac9265775347a7cee84b92 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
+bc75a2a1f2d729595ce2f0297e6f15f139a80b06 iommu/arm-smmu: workaround DMA mode issues
+a0848af208965c3dfc0088695ffb5ff8bf3b8bcc rh_kabi: introduce RH_KABI_EXCLUDE
+4e1eeb20578912d3e4e22ce09332a7b61537f87f ipmi: do not configure ipmi for HPE m400
+6a0b92eed96ba7eae2552301b65ef69243a2b7b0 IB/rxe: Mark Soft-RoCE Transport driver as tech-preview
+c0708650e75b643818b38693ecd6d5ed0d5bc7c6 scsi: smartpqi: add inspur advantech ids
+8dc0bc473e1012c0e660359c5a4fa277b76c1673 ice: mark driver as tech-preview
+4936bf80b84807b47cda3c77ef0218c99ea937c6 kABI: Add generic kABI macros to use for kABI workarounds
+7086fb873e5507079c92b78c474cdc4ed4e1a56d add pci_hw_vendor_status()
+27f4611163cea50a706e3a151ed002fb87f800a0 ahci: thunderx2: Fix for errata that affects stop engine
+7af030958933c4b107fcffa4e5b9cf87f17c92bd Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
+d5a6b43b0a2c141b05c99e94fbeff95e6ffed98e bpf: Add tech preview taint for syscall
+8c5af605b98ababb4e8498b83666ca4efec49ac7 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
+bc0745a1bbeb715866b885cb48c807b9184ce651 add Red Hat-specific taint flags
+399fb032c09f96b6b2c183edf7dd9ed883940cbd kdump: fix a grammar issue in a kernel message
+f15181481f999316e5f638f455aa327ad778004f tags.sh: Ignore redhat/rpm
+dffb37699813e29c2e2f4f1f14cf8450f4488f48 put RHEL info into generated headers
+35cc3773d5bf853ebe6fbefaee74bc7f58c5c91f kdump: add support for crashkernel=auto
+5d7a4d4ff5c755cb747f9d3af86ad182ceeea05e kdump: round up the total memory size to 128M for crashkernel reservation
+c750840bb23a14c00fd6e5e9c503c5cbaca2f55a acpi: prefer booting with ACPI over DTS
+1eb76f4018166a2d2d4f8b643936154c1408af4a aarch64: acpi scan: Fix regression related to X-Gene UARTs
+1fdff94dd0be0fdee5b57830ca2e8225ad46507b ACPI / irq: Workaround firmware issue on X-Gene based m400
+2bb817df21bfb67a0f586a9d848b41655d6624e3 modules: add rhelversion MODULE_INFO tag
+e4d3e12560c5747bdce3d8a350f5f04da38425fc ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
+76c6bf67413f363c6941327a9b4bf2bdacd07868 Add Red Hat tainting
+379f6759a865681f716334965b7605feea26e738 Introduce CONFIG_RH_DISABLE_DEPRECATED
+43557447afe99a0181e0f80e682a7cbdc03b4e7a gitattributes: Remove unnecesary export restrictions
+f003c79ead7f293e9315954c2c0fe39dda34459d Add RHMAINTAINERS file and supporting conf
+825b7aa1169c8a40f81b3b3a886a866ae80c3dc2 gitlab: Add CI job for packaging scripts
+a99885a5e77af594dfdce586cc83e5911d8401ce Pull the RHEL version defines out of the Makefile
+cd3a5d30570279538623ea8a1255db0ee4b728f7 [initial commit] Add Red Hat variables in the top level makefile
+9646ba0fd73d6c948df5532d22b6d1e452930cc2 [initial commit] Red Hat gitignore and attributes
diff --git a/kernel.spec b/kernel.spec
index 37caf60e6..f6e593825 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc6.20200925git171d4ff79f96.17
+%global distro_build 0.rc7.20
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.9.0
-%define pkgrelease 0.rc6.20200925git171d4ff79f96.17
+%define pkgrelease 0.rc7.20
# This is needed to do merge window version magic
%define patchlevel 9
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20200925git171d4ff79f96.17%{?buildid}%{?dist}
+%define specrelease 0.rc7.20%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -166,7 +166,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.9
@@ -182,10 +182,10 @@ Summary: The Linux kernel
# no whitelist
%define with_kernel_abi_whitelists 0
# Fedora builds these separately
+%endif
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-%endif
%if %{with_verbose}
%define make_opts V=1
@@ -566,7 +566,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200925git171d4ff79f96.tar.xz
+Source0: linux-5.9-rc7.tar.xz
Source1: Makefile.rhelver
@@ -708,6 +708,7 @@ Source2001: cpupower.config
Source3000: merge.pl
Source3001: kernel-local
Source3002: Patchlist
+Source3003: Patchlist.changelog
Source4000: README.rst
@@ -1284,8 +1285,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200925git171d4ff79f96 -c
-mv linux-20200925git171d4ff79f96 linux-%{KVERREL}
+%setup -q -n kernel-5.9-rc7 -c
+mv linux-5.9-rc7 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2071,7 +2072,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
%global perf_make \
%{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
-+%global _lto_cflags %{nil}
# perf
# make sure check-headers.sh is executable
chmod +x tools/perf/check-headers.sh
@@ -2795,6 +2795,30 @@ fi
#
#
%changelog
+* Mon Sep 28 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.19]
+- Merge ark-patches
+
+* Mon Sep 28 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.18.test]
+- v5.9-rc7 rebase
+- Updated changelog for the release based on a1bffa48745a (Fedora Kernel Team)
+
+* Sun Sep 27 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200927gita1bffa48745a.18]
+- Merge ark-patches
+
+* Sun Sep 27 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200927gita1bffa48745a.17.test]
+- a1bffa48745a rebase
+- Updated changelog for the release based on 7c7ec3226f5f (Fedora Kernel Team)
+- Create Patchlist.changelog file (Don Zickus)
+
+* Sat Sep 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200926git7c7ec3226f5f.17]
+- Merge ark-patches
+
+* Sat Sep 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200926git7c7ec3226f5f.16.test]
+- 7c7ec3226f5f rebase
+- Filter out upstream commits from changelog (Don Zickus)
+- Merge Upstream script fixes (Don Zickus)
+- Updated changelog for the release based on 171d4ff79f96 (Fedora Kernel Team)
+
* Fri Sep 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200925git171d4ff79f96.16]
- Merge ark-patches
diff --git a/sources b/sources
index 73b8e8dfd..9b7999ce0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200925git171d4ff79f96.tar.xz) = 792f914800e47952740816fe90b222ab9aececc14ba16a427772d3a47760cb5db5c508efcfce17919315b6f1ae1d91a14c286115dd39b0e8540fc7b13442155c
-SHA512 (kernel-abi-whitelists-5.9.0-0.rc6.20200925git171d4ff79f96.17.tar.bz2) = a5faa521dc1025b4d1809ab718d8766c48d30098166c8f2c6cd3551dbb11b57062f0c407b2a99090dca967cdb15489061b9b2373d3654d4d5cdc44aa1a567161
-SHA512 (kernel-kabi-dw-5.9.0-0.rc6.20200925git171d4ff79f96.17.tar.bz2) = 7ede200b1a0432d29e2ad074ea1b04122cf76d2a69e8f5aa58273d610795834e4db29d48d71b22f210686461a17a7ae074487d571a2ce65d8b0ede468985d619
+SHA512 (linux-5.9-rc7.tar.xz) = cd3ad94a6c2e60ccce7db1343dd6a7ae4f06de8426f22fb2cc6b693fe83f7b1c3825cb80bde353ebfc659debdea14b333546848828ebb971036356e3515d8616
+SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20.tar.bz2) = 4065f8f5f99f14f0e79e82843c8616ea44916b086804dd479291488d2bb5700623d13427c87501517d199739175f50163deb5bde93c2abe6d90d398f668968b8
+SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20.tar.bz2) = 25dc7a540a35b0787730c4b3261993afaeeed75855a92f33b673369c0b188092f57de4e94994eab8c739e581dc5279726c5d85c8ddbbb1d1480b1557b401c190