diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-29 16:12:02 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-29 16:12:02 -0500 |
| commit | 67f313c852f247a960a3b75eeff433ee42cd388c (patch) | |
| tree | 0f43a3abb8b8c077392ce0d0dd9b11f014f69aab | |
| parent | 68dd5fcadc5b702c7d1426dea990ff0b55e62f42 (diff) | |
| download | kernel-67f313c852f247a960a3b75eeff433ee42cd388c.tar.gz kernel-67f313c852f247a960a3b75eeff433ee42cd388c.tar.xz kernel-67f313c852f247a960a3b75eeff433ee42cd388c.zip | |
kernel-5.7.0-0.rc3.20200429git1d2cc5ac6f66.1
* Wed Apr 29 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200429git1d2cc5ac6f66.1]
- 1d2cc5ac6f66 rebase
- Add cec to the filter overrides ("Justin M. Forbes")
- Add overrides to filter-modules.sh ("Justin M. Forbes")
- Copy Makefile.rhelver as a source file rather than a patch (Jeremy Cline)
- Move the sed to clear the patch templating outside of conditionals ("Justin M. Forbes")
- Only include open merge requests with "Include in Releases" label (Jeremy Cline)
- Exit non-zero if the tag already exists for a release (Jeremy Cline)
- Adjust the changelog update script to not push anything (Jeremy Cline)
- Drop --target noarch from the rh-rpms make target (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
87 files changed, 206 insertions, 952 deletions
diff --git a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch index 813e5864a..631d06482 100644 --- a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch +++ b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch @@ -1,4 +1,4 @@ -From 0018a5bc0656191ce8e762896b273273a7324499 Mon Sep 17 00:00:00 2001 +From 786b3be00963b8a11715752f153da422cb25b3a9 Mon Sep 17 00:00:00 2001 From: Al Stone <ahs3@redhat.com> Date: Tue, 27 Feb 2018 00:21:23 -0500 Subject: [PATCH] ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support diff --git a/0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch b/0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch index fb0eaead2..92036f641 100644 --- a/0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch +++ b/0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch @@ -1,4 +1,4 @@ -From 1cfb64842a2a462961a08de6aa5ba8b06cbb3a7b Mon Sep 17 00:00:00 2001 +From ff688995702833fd359fc9f4965edc876bd5fe3b Mon Sep 17 00:00:00 2001 From: Mark Salter <msalter@redhat.com> Date: Thu, 10 May 2018 17:38:43 -0400 Subject: [PATCH] ACPI / irq: Workaround firmware issue on X-Gene based m400 diff --git a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch index 43bf6529e..3c3307303 100644 --- a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch +++ b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch @@ -1,4 +1,4 @@ -From 4caf4c44b069a43ee9115950aec7bd5ca8d68e56 Mon Sep 17 00:00:00 2001 +From 04c1f7e6ca8802b801e683445e8eea5dde001e0a Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.masahiro@socionext.com> Date: Mon, 30 Sep 2019 14:59:25 +0900 Subject: [PATCH] ARM: fix __get_user_check() in case uaccess_* calls are not diff --git a/0001-ARM-tegra-usb-no-reset.patch b/0001-ARM-tegra-usb-no-reset.patch index 88dbbcaaf..259570871 100644 --- a/0001-ARM-tegra-usb-no-reset.patch +++ b/0001-ARM-tegra-usb-no-reset.patch @@ -1,4 +1,4 @@ -From 9aa3d41f6a7f30f7626c69b0977a99a7cb25ff7c Mon Sep 17 00:00:00 2001 +From 1aebc49788c19fc7fb0401c67e4a2f95824a2fc8 Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> Date: Thu, 3 May 2012 20:27:11 +0100 Subject: [PATCH] ARM: tegra: usb no reset diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch index 80988ecfd..ad91122ef 100644 --- a/0001-Add-Red-Hat-tainting.patch +++ b/0001-Add-Red-Hat-tainting.patch @@ -1,4 +1,4 @@ -From 1ffa328bd3b832ada4a053c066c98d5b409cf2ab Mon Sep 17 00:00:00 2001 +From 096ebc2c3b825fd609547f7760cf5c47e7f454f3 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Wed, 13 Nov 2019 14:44:31 -0500 Subject: [PATCH] Add Red Hat tainting diff --git a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch index fac13981f..5ee73ce78 100644 --- a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +++ b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -1,4 +1,4 @@ -From 20afc80217c6e57f2d9a5d9fda04b248ae481601 Mon Sep 17 00:00:00 2001 +From c41562f22f17f3bf3f1e5125badb65e123fabba1 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones@redhat.com> Date: Mon, 2 Oct 2017 18:22:13 -0400 Subject: [PATCH] Add efi_status_to_str() and rework efi_status_to_err(). diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch index ac709b6ea..bf56cb792 100644 --- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch @@ -1,4 +1,4 @@ -From 26abdd25feda444be5a35697296b59c7a8fe4b82 Mon Sep 17 00:00:00 2001 +From d2f3bac9146220d315c9669a9b04f1dd844b1546 Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> Date: Wed, 26 Feb 2020 13:38:40 -0500 Subject: [PATCH] Add option of 13 for FORCE_MAX_ZONEORDER diff --git a/0001-Add-support-for-deprecating-processors.patch b/0001-Add-support-for-deprecating-processors.patch index c8e827369..5bf13400d 100644 --- a/0001-Add-support-for-deprecating-processors.patch +++ b/0001-Add-support-for-deprecating-processors.patch @@ -1,4 +1,4 @@ -From 7689ffbf6dc76d5bc8947b994c36b23d84759ffb Mon Sep 17 00:00:00 2001 +From 52feb7e4b2bfdc929dd588a8cecf89082a8f43da Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Wed, 13 Nov 2019 14:44:30 -0500 Subject: [PATCH] Add support for deprecating processors diff --git a/0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch b/0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch deleted file mode 100644 index c7bf7e8a4..000000000 --- a/0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2ddddd0b4e89e1fc30ed257653239005d2f31f5b Mon Sep 17 00:00:00 2001 -From: Michael Kelley <mikelley@microsoft.com> -Date: Mon, 20 Apr 2020 09:49:26 -0700 -Subject: [PATCH] Drivers: hv: Move AEOI determination to architecture - dependent code - -Hyper-V on ARM64 doesn't provide a flag for the AEOI recommendation -in ms_hyperv.hints, so having the test in architecture independent -code doesn't work. Resolve this by moving the check of the flag -to an architecture dependent helper function. No functionality is -changed. - -Signed-off-by: Michael Kelley <mikelley@microsoft.com> -Link: https://lore.kernel.org/r/20200420164926.24471-1-mikelley@microsoft.com -Signed-off-by: Wei Liu <wei.liu@kernel.org> ---- - arch/x86/include/asm/mshyperv.h | 2 ++ - drivers/hv/hv.c | 6 +----- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h -index 6b79515abb82..7c2bbd6675dc 100644 ---- a/arch/x86/include/asm/mshyperv.h -+++ b/arch/x86/include/asm/mshyperv.h -@@ -34,6 +34,8 @@ typedef int (*hyperv_fill_flush_list_func)( - rdmsrl(HV_X64_MSR_SINT0 + int_num, val) - #define hv_set_synint_state(int_num, val) \ - wrmsrl(HV_X64_MSR_SINT0 + int_num, val) -+#define hv_recommend_using_aeoi() \ -+ (!(ms_hyperv.hints & HV_DEPRECATING_AEOI_RECOMMENDED)) - - #define hv_get_crash_ctl(val) \ - rdmsrl(HV_X64_MSR_CRASH_CTL, val) -diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c -index 6098e0cbdb4b..533c8b82b344 100644 ---- a/drivers/hv/hv.c -+++ b/drivers/hv/hv.c -@@ -184,11 +184,7 @@ void hv_synic_enable_regs(unsigned int cpu) - - shared_sint.vector = HYPERVISOR_CALLBACK_VECTOR; - shared_sint.masked = false; -- if (ms_hyperv.hints & HV_DEPRECATING_AEOI_RECOMMENDED) -- shared_sint.auto_eoi = false; -- else -- shared_sint.auto_eoi = true; -- -+ shared_sint.auto_eoi = hv_recommend_using_aeoi(); - hv_set_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64); - - /* Enable the global synic bit */ --- -2.26.2 - diff --git a/0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch b/0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch deleted file mode 100644 index 29c17a375..000000000 --- a/0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 1a06d017fb3f388734ffbe5dedee6f8c3af5f2db Mon Sep 17 00:00:00 2001 -From: Dexuan Cui <decui@microsoft.com> -Date: Sat, 11 Apr 2020 20:50:35 -0700 -Subject: [PATCH] Drivers: hv: vmbus: Fix Suspend-to-Idle for Generation-2 VM - -Before the hibernation patchset (e.g. f53335e3289f), in a Generation-2 -Linux VM on Hyper-V, the user can run "echo freeze > /sys/power/state" to -freeze the system, i.e. Suspend-to-Idle. The user can press the keyboard -or move the mouse to wake up the VM. - -With the hibernation patchset, Linux VM on Hyper-V can hibernate to disk, -but Suspend-to-Idle is broken: when the synthetic keyboard/mouse are -suspended, there is no way to wake up the VM. - -Fix the issue by not suspending and resuming the vmbus devices upon -Suspend-to-Idle. - -Fixes: f53335e3289f ("Drivers: hv: vmbus: Suspend/resume the vmbus itself for hibernation") -Cc: stable@vger.kernel.org -Reviewed-by: Michael Kelley <mikelley@microsoft.com> -Signed-off-by: Dexuan Cui <decui@microsoft.com> -Link: https://lore.kernel.org/r/1586663435-36243-1-git-send-email-decui@microsoft.com -Signed-off-by: Wei Liu <wei.liu@kernel.org> ---- - drivers/hv/vmbus_drv.c | 43 +++++++++++++++++++++++++++++++++--------- - 1 file changed, 34 insertions(+), 9 deletions(-) - -diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index a68bce4d0ddb..e06c6b9555cf 100644 ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -978,6 +978,9 @@ static int vmbus_resume(struct device *child_device) - - return drv->resume(dev); - } -+#else -+#define vmbus_suspend NULL -+#define vmbus_resume NULL - #endif /* CONFIG_PM_SLEEP */ - - /* -@@ -997,11 +1000,22 @@ static void vmbus_device_release(struct device *device) - } - - /* -- * Note: we must use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS rather than -- * SET_SYSTEM_SLEEP_PM_OPS: see the comment before vmbus_bus_pm. -+ * Note: we must use the "noirq" ops: see the comment before vmbus_bus_pm. -+ * -+ * suspend_noirq/resume_noirq are set to NULL to support Suspend-to-Idle: we -+ * shouldn't suspend the vmbus devices upon Suspend-to-Idle, otherwise there -+ * is no way to wake up a Generation-2 VM. -+ * -+ * The other 4 ops are for hibernation. - */ -+ - static const struct dev_pm_ops vmbus_pm = { -- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(vmbus_suspend, vmbus_resume) -+ .suspend_noirq = NULL, -+ .resume_noirq = NULL, -+ .freeze_noirq = vmbus_suspend, -+ .thaw_noirq = vmbus_resume, -+ .poweroff_noirq = vmbus_suspend, -+ .restore_noirq = vmbus_resume, - }; - - /* The one and only one */ -@@ -2281,6 +2295,9 @@ static int vmbus_bus_resume(struct device *dev) - - return 0; - } -+#else -+#define vmbus_bus_suspend NULL -+#define vmbus_bus_resume NULL - #endif /* CONFIG_PM_SLEEP */ - - static const struct acpi_device_id vmbus_acpi_device_ids[] = { -@@ -2291,16 +2308,24 @@ static const struct acpi_device_id vmbus_acpi_device_ids[] = { - MODULE_DEVICE_TABLE(acpi, vmbus_acpi_device_ids); - - /* -- * Note: we must use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS rather than -- * SET_SYSTEM_SLEEP_PM_OPS, otherwise NIC SR-IOV can not work, because the -- * "pci_dev_pm_ops" uses the "noirq" callbacks: in the resume path, the -- * pci "noirq" restore callback runs before "non-noirq" callbacks (see -+ * Note: we must use the "no_irq" ops, otherwise hibernation can not work with -+ * PCI device assignment, because "pci_dev_pm_ops" uses the "noirq" ops: in -+ * the resume path, the pci "noirq" restore op runs before "non-noirq" op (see - * resume_target_kernel() -> dpm_resume_start(), and hibernation_restore() -> - * dpm_resume_end()). This means vmbus_bus_resume() and the pci-hyperv's -- * resume callback must also run via the "noirq" callbacks. -+ * resume callback must also run via the "noirq" ops. -+ * -+ * Set suspend_noirq/resume_noirq to NULL for Suspend-to-Idle: see the comment -+ * earlier in this file before vmbus_pm. - */ -+ - static const struct dev_pm_ops vmbus_bus_pm = { -- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(vmbus_bus_suspend, vmbus_bus_resume) -+ .suspend_noirq = NULL, -+ .resume_noirq = NULL, -+ .freeze_noirq = vmbus_bus_suspend, -+ .thaw_noirq = vmbus_bus_resume, -+ .poweroff_noirq = vmbus_bus_suspend, -+ .restore_noirq = vmbus_bus_resume - }; - - static struct acpi_driver vmbus_acpi_driver = { --- -2.26.2 - diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index ab91e4e49..46e41630d 100644 --- a/0001-Drop-that-for-now.patch +++ b/0001-Drop-that-for-now.patch @@ -1,4 +1,4 @@ -From be31635f17242d6736db5f8d640d4bec889c317b Mon Sep 17 00:00:00 2001 +From 93d805194c5394a26e14580281702e96d2ce602b Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Wed, 23 Jan 2019 14:36:37 +0100 Subject: [PATCH] Drop that for now diff --git a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch index 7fae9a9fa..1041dd968 100644 --- a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch +++ b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch @@ -1,4 +1,4 @@ -From 83a7529b27e3e82e3af56c7c28725eb094525cb3 Mon Sep 17 00:00:00 2001 +From b16d461c4a5ba607b0d8dfedd3e2f5028bec7aa2 Mon Sep 17 00:00:00 2001 From: Don Dutile <ddutile@redhat.com> Date: Tue, 24 Jul 2018 22:29:16 -0400 Subject: [PATCH] IB/rxe: Mark Soft-RoCE Transport driver as tech-preview diff --git a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch index f9c8192d8..6c2cea35e 100644 --- a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch +++ b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch @@ -1,4 +1,4 @@ -From de17e7604f084f9e9fe3c03e47ca8496026b405e Mon Sep 17 00:00:00 2001 +From a60673fa5c90271d8e0111ca520202c9cd53ac7a Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Mon, 3 Apr 2017 18:18:21 +0200 Subject: [PATCH] Input: rmi4 - remove the need for artificial IRQ in case of diff --git a/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch b/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch index 182a543c1..bb52d868f 100644 --- a/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch +++ b/0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch @@ -1,4 +1,4 @@ -From 9d47ca3f7de90d60c6439b7f77d80937bce6e8a7 Mon Sep 17 00:00:00 2001 +From bc75138f332f5af1421cbd818ef0297d6773d2d5 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Wed, 13 Nov 2019 14:44:28 -0500 Subject: [PATCH] Introduce CONFIG_RH_DISABLE_DEPRECATED diff --git a/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch b/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch index 698b80e55..e2b98fc87 100644 --- a/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch +++ b/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch @@ -1,4 +1,4 @@ -From 964ec8628e7a23541431bc0c7d0298f21d1e6098 Mon Sep 17 00:00:00 2001 +From a1bfe76d35f3e0c917ec16704f3a5a905d741f49 Mon Sep 17 00:00:00 2001 From: Robert Holmes <robeholmes@gmail.com> Date: Tue, 23 Apr 2019 07:39:29 +0000 Subject: [PATCH] KEYS: Make use of platform keyring for module signature diff --git a/0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch b/0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch index c218925dd..3cedaff5a 100644 --- a/0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch +++ b/0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch @@ -1,4 +1,4 @@ -From 1c3b9deffb4dd685da31525d0add7a7e062cd4eb Mon Sep 17 00:00:00 2001 +From 860a8b99028a214fe489ba6500c74c0e2c82b243 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones@redhat.com> Date: Mon, 2 Oct 2017 18:18:30 -0400 Subject: [PATCH] Make get_cert_list() use efi_status_to_str() to print error diff --git a/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch b/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch index f8c154a2c..23c5f7a17 100644 --- a/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch +++ b/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch @@ -1,4 +1,4 @@ -From 2d64e2fe0bc3541b982f4e0a670302c96671d300 Mon Sep 17 00:00:00 2001 +From a5499259ef1b4e320f0ad3348976340c93ad30cf Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Date: Tue, 10 Mar 2020 13:52:41 +0100 Subject: [PATCH] PCI: brcmstb: Wait for Raspberry Pi's firmware when present diff --git a/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch b/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch index a42c443de..db691c767 100644 --- a/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch +++ b/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch @@ -1,4 +1,4 @@ -From f5d017f0ca1d18a135c5cff8561ef7db2d9b420c Mon Sep 17 00:00:00 2001 +From cf2d790dc2658df565870ba35f8479215eee9f88 Mon Sep 17 00:00:00 2001 From: Dick Kennedy <dkennedy@redhat.com> Date: Fri, 14 Feb 2020 15:09:41 -0500 Subject: [PATCH] Removing Obsolete hba pci-ids from rhel8 diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index 9323c6d39..b5f2cbeea 100644 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch @@ -1,4 +1,4 @@ -From 789e5479b22b1c8f80037114327a77f8c5fd8553 Mon Sep 17 00:00:00 2001 +From 1843bce6a6a9ae317052f1fdd8550d23e4da3118 Mon Sep 17 00:00:00 2001 From: Don Zickus <dzickus@redhat.com> Date: Tue, 3 Mar 2020 09:35:28 -0500 Subject: [PATCH] Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES diff --git a/0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch b/0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch index d0cb8c5c8..ed0c5f411 100644 --- a/0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch +++ b/0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch @@ -1,4 +1,4 @@ -From 8a98f76ee1da2185f8e77a96d17d18ffb813a5e7 Mon Sep 17 00:00:00 2001 +From 2395c0a7b3d22fa7788a6131ff0b6c6035c29368 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Date: Tue, 10 Mar 2020 13:52:42 +0100 Subject: [PATCH] USB: pci-quirks: Add Raspberry Pi 4 quirk diff --git a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch index 363b39d51..400ab01b9 100644 --- a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch +++ b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch @@ -1,4 +1,4 @@ -From f1450d57ec4a8893d9a199bdb5394da56569a62b Mon Sep 17 00:00:00 2001 +From 7cb81ca11750a23dbaf581d0e05f551fb58e9d84 Mon Sep 17 00:00:00 2001 From: Robert Richter <rrichter@redhat.com> Date: Thu, 7 Jun 2018 22:59:32 -0400 Subject: [PATCH] Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon diff --git a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch index 7e9f2f1be..ed6f9aa13 100644 --- a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch +++ b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch @@ -1,4 +1,4 @@ -From 3f69b3e4d265af7670bde1bafc33021827122bff Mon Sep 17 00:00:00 2001 +From b928b1a8cdcb15e9ef7f308ef055377bb7354580 Mon Sep 17 00:00:00 2001 From: Raghava Aditya Renukunta <rrenukun@redhat.com> Date: Thu, 2 Jan 2020 14:24:38 -0500 Subject: [PATCH] aacraid: Remove depreciated device and vendor PCI id's diff --git a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch index 30ccc47ab..292851bc3 100644 --- a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch +++ b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch @@ -1,4 +1,4 @@ -From 337f532cd8c3159e40b529b8d1523af554a1ef3d Mon Sep 17 00:00:00 2001 +From 015d48502b97242977999a59b7067f8da626da2a Mon Sep 17 00:00:00 2001 From: Mark Salter <msalter@redhat.com> Date: Thu, 10 May 2018 17:38:44 -0400 Subject: [PATCH] aarch64: acpi scan: Fix regression related to X-Gene UARTs diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch index 7dac1a75d..8afaa2ac4 100644 --- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch @@ -1,4 +1,4 @@ -From 6d75d943e2a82cebebb572c0cbe8b3fff6999da2 Mon Sep 17 00:00:00 2001 +From 921a5b306b34d08359997bf094860b7880f886e9 Mon Sep 17 00:00:00 2001 From: Mark Salter <msalter@redhat.com> Date: Fri, 11 May 2018 21:01:17 -0400 Subject: [PATCH] acpi: prefer booting with ACPI over DTS diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch index 1d5a939cb..6e369b5a0 100644 --- a/0001-add-Red-Hat-specific-taint-flags.patch +++ b/0001-add-Red-Hat-specific-taint-flags.patch @@ -1,4 +1,4 @@ -From b84263379a001bf40881039466778d8082b11c6f Mon Sep 17 00:00:00 2001 +From f10769909cec3c86b746eed312830626545f7a16 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov <esyr@redhat.com> Date: Thu, 14 Jun 2018 16:35:59 -0400 Subject: [PATCH] add Red Hat-specific taint flags diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch index 9ee4e392b..fc31b2bdb 100644 --- a/0001-add-pci_hw_vendor_status.patch +++ b/0001-add-pci_hw_vendor_status.patch @@ -1,4 +1,4 @@ -From 561b81932e4899eab572c7b76e5b00b3e49ec548 Mon Sep 17 00:00:00 2001 +From e3b63053c68b2d47be828d4392f0f679fd65863b Mon Sep 17 00:00:00 2001 From: Maurizio Lombardi <mlombard@redhat.com> Date: Mon, 18 Jun 2018 12:51:25 -0400 Subject: [PATCH] add pci_hw_vendor_status() diff --git a/0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch b/0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch index 70e061a40..a20e50fe1 100644 --- a/0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch +++ b/0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch @@ -1,4 +1,4 @@ -From 8aa481455a8bc31110c1915f4f67a132753ed523 Mon Sep 17 00:00:00 2001 +From 9f7d357901a8d3e6e739c920e6046934fcf091c9 Mon Sep 17 00:00:00 2001 From: Robert Richter <rrichter@redhat.com> Date: Thu, 7 Jun 2018 22:59:33 -0400 Subject: [PATCH] ahci: thunderx2: Fix for errata that affects stop engine diff --git a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch index 4a1913909..e60387b2a 100644 --- a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch +++ b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch @@ -1,4 +1,4 @@ -From 8e7368c1d6650a93c77093b9ed1a984c64342d64 Mon Sep 17 00:00:00 2001 +From 6689ee7c24faa2ebe0bcd3c6f66b68fb073fdef3 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Tue, 1 Oct 2019 15:51:23 +0000 Subject: [PATCH] arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT diff --git a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch index 99d36fd7e..87d04262c 100644 --- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch +++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch @@ -1,4 +1,4 @@ -From 37e0967bc53c2721aba44daa6be9cf4a7d2fd19b Mon Sep 17 00:00:00 2001 +From 6d45539329e9fef5662c3eceede6942f3b32a1fe Mon Sep 17 00:00:00 2001 From: Jon Masters <jcm@redhat.com> Date: Thu, 18 Jul 2019 15:47:26 -0400 Subject: [PATCH] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT diff --git a/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch b/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch index 1574e0790..d627dbc54 100644 --- a/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch +++ b/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch @@ -1,4 +1,4 @@ -From d142acd33ab2191d6abd9aeff17345d2d716b29a Mon Sep 17 00:00:00 2001 +From 5fb8cde49305eb180d393a06d10b30f8eb906c66 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng <icenowy@aosc.io> Date: Mon, 16 Mar 2020 21:35:03 +0800 Subject: [PATCH] arm64: allwinner: dts: a64: add LCD-related device nodes for diff --git a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch b/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch index 5de783464..bde3662b8 100644 --- a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch +++ b/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch @@ -1,4 +1,4 @@ -From 4b5a204b0412f7ebeedb4f948717a0e328681404 Mon Sep 17 00:00:00 2001 +From 4e52ceeaac8930062c30de86e7ec2bcbc322a7d9 Mon Sep 17 00:00:00 2001 From: Jon Hunter <jonathanh@nvidia.com> Date: Mon, 24 Feb 2020 14:07:48 +0000 Subject: [PATCH] backlight: lp855x: Ensure regulators are disabled on probe diff --git a/0001-be2iscsi-remove-unsupported-device-IDs.patch b/0001-be2iscsi-remove-unsupported-device-IDs.patch index cabe27634..f97dbd9bd 100644 --- a/0001-be2iscsi-remove-unsupported-device-IDs.patch +++ b/0001-be2iscsi-remove-unsupported-device-IDs.patch @@ -1,4 +1,4 @@ -From 6d6f0bd93f78c17f6c88e431d2e991ffbd0bd398 Mon Sep 17 00:00:00 2001 +From 6975f53d97a0cc546d871046fae851ed646b61c1 Mon Sep 17 00:00:00 2001 From: Chris Leech <cleech@redhat.com> Date: Thu, 2 Jan 2020 14:24:43 -0500 Subject: [PATCH] be2iscsi: remove unsupported device IDs diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch index 5a9a4df83..754b9bd17 100644 --- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch +++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch @@ -1,4 +1,4 @@ -From 33a5dcb6c174dfe5015c5348da856c27d0de1610 Mon Sep 17 00:00:00 2001 +From bcbcdf5d7b57613bfea57c7300ed33e8da438533 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov <esyr@redhat.com> Date: Thu, 14 Jun 2018 16:36:08 -0400 Subject: [PATCH] bpf: Add tech preview taint for syscall diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch index 5377c2631..1f56f10b6 100644 --- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch +++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch @@ -1,4 +1,4 @@ -From f5b35af16669554a456b1c2258b75cce0d1d4e2d Mon Sep 17 00:00:00 2001 +From 4c8f4595823e97da667fc0ad319fe0390b7da65d Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov <esyr@redhat.com> Date: Thu, 14 Jun 2018 16:36:02 -0400 Subject: [PATCH] bpf: set unprivileged_bpf_disabled to 1 by default, add a diff --git a/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch b/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch deleted file mode 100644 index 96ff5ff88..000000000 --- a/0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 317ddf3715cd4083e0e5914c17e897e72e779445 Mon Sep 17 00:00:00 2001 -From: Nishad Kamdar <nishadkamdar@gmail.com> -Date: Sun, 19 Apr 2020 20:06:44 +0530 -Subject: [PATCH] btrfs: discard: Use the correct style for SPDX License - Identifier - -This patch corrects the SPDX License Identifier style in header file -related to Btrfs File System support. For C header files -Documentation/process/license-rules.rst mandates C-like comments -(opposed to C source files where C++ style should be used). - -Changes made by using a script provided by Joe Perches here: -https://lkml.org/lkml/2019/2/7/46. - -Suggested-by: Joe Perches <joe@perches.com> -Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com> -Reviewed-by: David Sterba <dsterba@suse.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/discard.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/btrfs/discard.h b/fs/btrfs/discard.h -index 21a15776dac4..353228d62f5a 100644 ---- a/fs/btrfs/discard.h -+++ b/fs/btrfs/discard.h -@@ -1,4 +1,4 @@ --// SPDX-License-Identifier: GPL-2.0 -+/* SPDX-License-Identifier: GPL-2.0 */ - - #ifndef BTRFS_DISCARD_H - #define BTRFS_DISCARD_H --- -2.26.2 - diff --git a/0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch b/0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch deleted file mode 100644 index 797cd956e..000000000 --- a/0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch +++ /dev/null @@ -1,150 +0,0 @@ -From ef67963dac255b293e19815ea3d440567be4626f Mon Sep 17 00:00:00 2001 -From: Josef Bacik <josef@toxicpanda.com> -Date: Tue, 24 Mar 2020 10:47:52 -0400 -Subject: [PATCH] btrfs: drop logs when we've aborted a transaction - -Dave reported a problem where we were panicing with generic/475 with -misc-5.7. This is because we were doing IO after we had stopped all of -the worker threads, because we do the log tree cleanup on roots at drop -time. Cleaning up the log tree will always need to do reads if we -happened to have evicted the blocks from memory. - -Because of this simply add a helper to btrfs_cleanup_transaction() that -will go through and drop all of the log roots. This gets run before we -do the close_ctree() work, and thus we are allowed to do any reads that -we would need. I ran this through many iterations of generic/475 with -constrained memory and I did not see the issue. - - general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b6b6b: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC PTI - CPU: 2 PID: 12359 Comm: umount Tainted: G W 5.6.0-rc7-btrfs-next-58 #1 - Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 - RIP: 0010:btrfs_queue_work+0x33/0x1c0 [btrfs] - RSP: 0018:ffff9cfb015937d8 EFLAGS: 00010246 - RAX: 0000000000000000 RBX: ffff8eb5e339ed80 RCX: 0000000000000000 - RDX: 0000000000000001 RSI: ffff8eb5eb33b770 RDI: ffff8eb5e37a0460 - RBP: ffff8eb5eb33b770 R08: 000000000000020c R09: ffffffff9fc09ac0 - R10: 0000000000000007 R11: 0000000000000000 R12: 6b6b6b6b6b6b6b6b - R13: ffff9cfb00229040 R14: 0000000000000008 R15: ffff8eb5d3868000 - FS: 00007f167ea022c0(0000) GS:ffff8eb5fae00000(0000) knlGS:0000000000000000 - CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 - CR2: 00007f167e5e0cb1 CR3: 0000000138c18004 CR4: 00000000003606e0 - DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 - Call Trace: - btrfs_end_bio+0x81/0x130 [btrfs] - __split_and_process_bio+0xaf/0x4e0 [dm_mod] - ? percpu_counter_add_batch+0xa3/0x120 - dm_process_bio+0x98/0x290 [dm_mod] - ? generic_make_request+0xfb/0x410 - dm_make_request+0x4d/0x120 [dm_mod] - ? generic_make_request+0xfb/0x410 - generic_make_request+0x12a/0x410 - ? submit_bio+0x38/0x160 - submit_bio+0x38/0x160 - ? percpu_counter_add_batch+0xa3/0x120 - btrfs_map_bio+0x289/0x570 [btrfs] - ? kmem_cache_alloc+0x24d/0x300 - btree_submit_bio_hook+0x79/0xc0 [btrfs] - submit_one_bio+0x31/0x50 [btrfs] - read_extent_buffer_pages+0x2fe/0x450 [btrfs] - btree_read_extent_buffer_pages+0x7e/0x170 [btrfs] - walk_down_log_tree+0x343/0x690 [btrfs] - ? walk_log_tree+0x3d/0x380 [btrfs] - walk_log_tree+0xf7/0x380 [btrfs] - ? plist_requeue+0xf0/0xf0 - ? delete_node+0x4b/0x230 - free_log_tree+0x4c/0x130 [btrfs] - ? wait_log_commit+0x140/0x140 [btrfs] - btrfs_free_log+0x17/0x30 [btrfs] - btrfs_drop_and_free_fs_root+0xb0/0xd0 [btrfs] - btrfs_free_fs_roots+0x10c/0x190 [btrfs] - ? do_raw_spin_unlock+0x49/0xc0 - ? _raw_spin_unlock+0x29/0x40 - ? release_extent_buffer+0x121/0x170 [btrfs] - close_ctree+0x289/0x2e6 [btrfs] - generic_shutdown_super+0x6c/0x110 - kill_anon_super+0xe/0x30 - btrfs_kill_super+0x12/0x20 [btrfs] - deactivate_locked_super+0x3a/0x70 - -Reported-by: David Sterba <dsterba@suse.com> -Fixes: 8c38938c7bb096 ("btrfs: move the root freeing stuff into btrfs_put_root") -Reviewed-by: Nikolay Borisov <nborisov@suse.com> -Reviewed-by: Filipe Manana <fdmanana@suse.com> -Signed-off-by: Josef Bacik <josef@toxicpanda.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/disk-io.c | 36 ++++++++++++++++++++++++++++++++---- - 1 file changed, 32 insertions(+), 4 deletions(-) - -diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index a6cb5cbbdb9f..d10c7be10f3b 100644 ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -2036,9 +2036,6 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info) - for (i = 0; i < ret; i++) - btrfs_drop_and_free_fs_root(fs_info, gang[i]); - } -- -- if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) -- btrfs_free_log_root_tree(NULL, fs_info); - } - - static void btrfs_init_scrub(struct btrfs_fs_info *fs_info) -@@ -3888,7 +3885,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, - spin_unlock(&fs_info->fs_roots_radix_lock); - - if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) { -- btrfs_free_log(NULL, root); -+ ASSERT(root->log_root == NULL); - if (root->reloc_root) { - btrfs_put_root(root->reloc_root); - root->reloc_root = NULL; -@@ -4211,6 +4208,36 @@ static void btrfs_error_commit_super(struct btrfs_fs_info *fs_info) - up_write(&fs_info->cleanup_work_sem); - } - -+static void btrfs_drop_all_logs(struct btrfs_fs_info *fs_info) -+{ -+ struct btrfs_root *gang[8]; -+ u64 root_objectid = 0; -+ int ret; -+ -+ spin_lock(&fs_info->fs_roots_radix_lock); -+ while ((ret = radix_tree_gang_lookup(&fs_info->fs_roots_radix, -+ (void **)gang, root_objectid, -+ ARRAY_SIZE(gang))) != 0) { -+ int i; -+ -+ for (i = 0; i < ret; i++) -+ gang[i] = btrfs_grab_root(gang[i]); -+ spin_unlock(&fs_info->fs_roots_radix_lock); -+ -+ for (i = 0; i < ret; i++) { -+ if (!gang[i]) -+ continue; -+ root_objectid = gang[i]->root_key.objectid; -+ btrfs_free_log(NULL, gang[i]); -+ btrfs_put_root(gang[i]); -+ } -+ root_objectid++; -+ spin_lock(&fs_info->fs_roots_radix_lock); -+ } -+ spin_unlock(&fs_info->fs_roots_radix_lock); -+ btrfs_free_log_root_tree(NULL, fs_info); -+} -+ - static void btrfs_destroy_ordered_extents(struct btrfs_root *root) - { - struct btrfs_ordered_extent *ordered; -@@ -4603,6 +4630,7 @@ static int btrfs_cleanup_transaction(struct btrfs_fs_info *fs_info) - btrfs_destroy_delayed_inodes(fs_info); - btrfs_assert_delayed_root_empty(fs_info); - btrfs_destroy_all_delalloc_inodes(fs_info); -+ btrfs_drop_all_logs(fs_info); - mutex_unlock(&fs_info->transaction_kthread_mutex); - - return 0; --- -2.26.2 - diff --git a/0001-btrfs-fix-block-group-leak-when-removing-fails.patch b/0001-btrfs-fix-block-group-leak-when-removing-fails.patch deleted file mode 100644 index 71c60cc30..000000000 --- a/0001-btrfs-fix-block-group-leak-when-removing-fails.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f6033c5e333238f299c3ae03fac8cc1365b23b77 Mon Sep 17 00:00:00 2001 -From: Xiyu Yang <xiyuyang19@fudan.edu.cn> -Date: Tue, 21 Apr 2020 10:54:11 +0800 -Subject: [PATCH] btrfs: fix block group leak when removing fails - -btrfs_remove_block_group() invokes btrfs_lookup_block_group(), which -returns a local reference of the block group that contains the given -bytenr to "block_group" with increased refcount. - -When btrfs_remove_block_group() returns, "block_group" becomes invalid, -so the refcount should be decreased to keep refcount balanced. - -The reference counting issue happens in several exception handling paths -of btrfs_remove_block_group(). When those error scenarios occur such as -btrfs_alloc_path() returns NULL, the function forgets to decrease its -refcnt increased by btrfs_lookup_block_group() and will cause a refcnt -leak. - -Fix this issue by jumping to "out_put_group" label and calling -btrfs_put_block_group() when those error scenarios occur. - -CC: stable@vger.kernel.org # 4.4+ -Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> -Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> -Reviewed-by: David Sterba <dsterba@suse.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/block-group.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c -index af9e9a008724..696f47103cfc 100644 ---- a/fs/btrfs/block-group.c -+++ b/fs/btrfs/block-group.c -@@ -916,7 +916,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, - path = btrfs_alloc_path(); - if (!path) { - ret = -ENOMEM; -- goto out; -+ goto out_put_group; - } - - /* -@@ -954,7 +954,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, - ret = btrfs_orphan_add(trans, BTRFS_I(inode)); - if (ret) { - btrfs_add_delayed_iput(inode); -- goto out; -+ goto out_put_group; - } - clear_nlink(inode); - /* One for the block groups ref */ -@@ -977,13 +977,13 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, - - ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1); - if (ret < 0) -- goto out; -+ goto out_put_group; - if (ret > 0) - btrfs_release_path(path); - if (ret == 0) { - ret = btrfs_del_item(trans, tree_root, path); - if (ret) -- goto out; -+ goto out_put_group; - btrfs_release_path(path); - } - -@@ -1102,9 +1102,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, - - ret = remove_block_group_free_space(trans, block_group); - if (ret) -- goto out; -+ goto out_put_group; - -- btrfs_put_block_group(block_group); -+ /* Once for the block groups rbtree */ - btrfs_put_block_group(block_group); - - ret = btrfs_search_slot(trans, root, &key, path, -1, 1); -@@ -1127,6 +1127,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, - /* once for the tree */ - free_extent_map(em); - } -+ -+out_put_group: -+ /* Once for the lookup reference */ -+ btrfs_put_block_group(block_group); - out: - if (remove_rsv) - btrfs_delayed_refs_rsv_release(fs_info, 1); --- -2.26.2 - diff --git a/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch b/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch deleted file mode 100644 index 5b9bd2cc1..000000000 --- a/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5150bf19635c335109542c19f6b84c7813810873 Mon Sep 17 00:00:00 2001 -From: Filipe Manana <fdmanana@suse.com> -Date: Fri, 17 Apr 2020 16:36:15 +0100 -Subject: [PATCH] btrfs: fix memory leak of transaction when deleting unused - block group - -When cleaning pinned extents right before deleting an unused block group, -we check if there's still a previous transaction running and if so we -increment its reference count before using it for cleaning pinned ranges -in its pinned extents iotree. However we ended up never decrementing the -reference count after using the transaction, resulting in a memory leak. - -Fix it by decrementing the reference count. - -Fixes: fe119a6eeb6705 ("btrfs: switch to per-transaction pinned extents") -Signed-off-by: Filipe Manana <fdmanana@suse.com> -Reviewed-by: David Sterba <dsterba@suse.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/block-group.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c -index 47f66c6a7d7f..af9e9a008724 100644 ---- a/fs/btrfs/block-group.c -+++ b/fs/btrfs/block-group.c -@@ -1288,11 +1288,15 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans, - if (ret) - goto err; - mutex_unlock(&fs_info->unused_bg_unpin_mutex); -+ if (prev_trans) -+ btrfs_put_transaction(prev_trans); - - return true; - - err: - mutex_unlock(&fs_info->unused_bg_unpin_mutex); -+ if (prev_trans) -+ btrfs_put_transaction(prev_trans); - btrfs_dec_block_group_ro(bg); - return false; - } --- -2.26.2 - diff --git a/0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch b/0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch deleted file mode 100644 index 52942ea7a..000000000 --- a/0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1402d17dfd9657be0da8458b2079d03c2d61c86a Mon Sep 17 00:00:00 2001 -From: Xiyu Yang <xiyuyang19@fudan.edu.cn> -Date: Mon, 20 Apr 2020 13:39:39 +0800 -Subject: [PATCH] btrfs: fix transaction leak in btrfs_recover_relocation - -btrfs_recover_relocation() invokes btrfs_join_transaction(), which joins -a btrfs_trans_handle object into transactions and returns a reference of -it with increased refcount to "trans". - -When btrfs_recover_relocation() returns, "trans" becomes invalid, so the -refcount should be decreased to keep refcount balanced. - -The reference counting issue happens in one exception handling path of -btrfs_recover_relocation(). When read_fs_root() failed, the refcnt -increased by btrfs_join_transaction() is not decreased, causing a refcnt -leak. - -Fix this issue by calling btrfs_end_transaction() on this error path -when read_fs_root() failed. - -Fixes: 79787eaab461 ("btrfs: replace many BUG_ONs with proper error handling") -CC: stable@vger.kernel.org # 4.4+ -Reviewed-by: Filipe Manana <fdmanana@suse.com> -Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> -Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/relocation.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c -index d35936c934ab..03bc7134e8cb 100644 ---- a/fs/btrfs/relocation.c -+++ b/fs/btrfs/relocation.c -@@ -4559,6 +4559,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) - if (IS_ERR(fs_root)) { - err = PTR_ERR(fs_root); - list_add_tail(&reloc_root->root_list, &reloc_roots); -+ btrfs_end_transaction(trans); - goto out_unset; - } - --- -2.26.2 - diff --git a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch index a7b03e982..f67b8576b 100644 --- a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch +++ b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch @@ -1,4 +1,4 @@ -From 114fa447298e14776dc9dfa9bb66d76d64b47f24 Mon Sep 17 00:00:00 2001 +From 307a8a59273fdbc8b61b1af36ba8b01a2b2093ef Mon Sep 17 00:00:00 2001 From: Icenowy Zheng <icenowy@aosc.io> Date: Mon, 16 Mar 2020 21:35:01 +0800 Subject: [PATCH] drm: panel: add Xingbangda XBD599 panel diff --git a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch index 30cb2a458..8ee5ee3a1 100644 --- a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch +++ b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch @@ -1,4 +1,4 @@ -From b8663826ddbaffcdfb85d97b8a418ab883f405f3 Mon Sep 17 00:00:00 2001 +From 1157bb3691e9d5bde5842d517059db850169ed3c Mon Sep 17 00:00:00 2001 From: Icenowy Zheng <icenowy@aosc.io> Date: Mon, 16 Mar 2020 21:35:02 +0800 Subject: [PATCH] drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation diff --git a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch b/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch index 810b12c94..e70affeb9 100644 --- a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +++ b/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch @@ -1,4 +1,4 @@ -From c6a0ac5f7ce81fe0d318f0b90427eb0a4e36c539 Mon Sep 17 00:00:00 2001 +From f250f792fbb8b9e5eb08af6f7573667812c67812 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot <manu@freebsd.org> Date: Wed, 4 Mar 2020 22:30:22 +0100 Subject: [PATCH] dt-bindings: Add doc for Pine64 Pinebook Pro diff --git a/0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch b/0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch index 18e856891..1e704f370 100644 --- a/0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch +++ b/0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch @@ -1,4 +1,4 @@ -From 48cfd34c34fd2385561461b6a9d425a9f4baf14d Mon Sep 17 00:00:00 2001 +From cf0024fbea727fca7d999dd39d8d0faa216e2a35 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng <icenowy@aosc.io> Date: Mon, 16 Mar 2020 21:35:00 +0800 Subject: [PATCH] dt-bindings: panel: add binding for Xingbangda XBD599 panel diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch index 9444872af..40920a633 100644 --- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch +++ b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch @@ -1,4 +1,4 @@ -From 41ce277c5128ae749021c0f6cb8bac6a4445844e Mon Sep 17 00:00:00 2001 +From 3b955d30aea59e0d70f725f9dd165248612c970a Mon Sep 17 00:00:00 2001 From: Aaron Ma <aaron.ma@canonical.com> Date: Tue, 24 Mar 2020 03:16:39 +0800 Subject: [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode diff --git a/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch b/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch index e09f9f2cc..077d3eb20 100644 --- a/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch +++ b/0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch @@ -1,4 +1,4 @@ -From d7668bfafdd5b71462452dd6727834ce606f37fe Mon Sep 17 00:00:00 2001 +From 0299a3501a198a965264ac1908f67005b1b222ad Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Tue, 27 Feb 2018 10:04:55 +0000 Subject: [PATCH] efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode diff --git a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch index c2f261f3f..9c9885009 100644 --- a/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +++ b/0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch @@ -1,4 +1,4 @@ -From 019d9ec8dc7139c8f792f8a704647be1f677bd2e Mon Sep 17 00:00:00 2001 +From 9b1e921e47dc27fd3205c17fd6831b7840a19476 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Mon, 30 Sep 2019 21:28:16 +0000 Subject: [PATCH] efi: Lock down the kernel if booted in secure boot mode diff --git a/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch b/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch index 4a613ca8a..40f1b5c44 100644 --- a/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch +++ b/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch @@ -1,4 +1,4 @@ -From 6ea30351b01775feef6f14694ac3dd15a8c736e4 Mon Sep 17 00:00:00 2001 +From de6802fd6cbf628d1f047aa19ff0f43557962ebc Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Date: Tue, 10 Mar 2020 13:52:40 +0100 Subject: [PATCH] firmware: raspberrypi: Introduce vl805 init routine diff --git a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch index fd059c928..18a01b500 100644 --- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch +++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch @@ -1,4 +1,4 @@ -From 0a028c95474ab745437af2a6da7963891e9b4227 Mon Sep 17 00:00:00 2001 +From 9a109605babb1cd70c6fe96097d77d5d1bd1835d Mon Sep 17 00:00:00 2001 From: Joseph Szczypek <jszczype@redhat.com> Date: Thu, 2 Jan 2020 14:24:40 -0500 Subject: [PATCH] hpsa: remove old cciss-based smartarray pci ids diff --git a/0001-hyper-v-Remove-internal-types-from-UAPI-header.patch b/0001-hyper-v-Remove-internal-types-from-UAPI-header.patch deleted file mode 100644 index 6466a3e18..000000000 --- a/0001-hyper-v-Remove-internal-types-from-UAPI-header.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f081bbb3fd03f949bcdc5aed95a827d7c65e0f30 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Date: Wed, 22 Apr 2020 16:18:18 +0300 -Subject: [PATCH] hyper-v: Remove internal types from UAPI header - -The uuid_le mistakenly comes to be an UAPI type. Since it's luckily not used by -Hyper-V APIs, we may replace with POD types, i.e. __u8 array. - -Note, previously shared uuid_be had been removed from UAPI few releases ago. -This is a continuation of that process towards removing uuid_le one. - -Note, there is no ABI change! - -Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Link: https://lore.kernel.org/r/20200422131818.23088-1-andriy.shevchenko@linux.intel.com -Signed-off-by: Wei Liu <wei.liu@kernel.org> ---- - include/uapi/linux/hyperv.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h -index 991b2b7ada7a..8f24404ad04f 100644 ---- a/include/uapi/linux/hyperv.h -+++ b/include/uapi/linux/hyperv.h -@@ -119,8 +119,8 @@ enum hv_fcopy_op { - - struct hv_fcopy_hdr { - __u32 operation; -- uuid_le service_id0; /* currently unused */ -- uuid_le service_id1; /* currently unused */ -+ __u8 service_id0[16]; /* currently unused */ -+ __u8 service_id1[16]; /* currently unused */ - } __attribute__((packed)); - - #define OVER_WRITE 0x1 --- -2.26.2 - diff --git a/0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch b/0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch deleted file mode 100644 index f61982d77..000000000 --- a/0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1d3c9c075462e9c5a474248e4b433861572f33e9 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Date: Wed, 22 Apr 2020 15:59:37 +0300 -Subject: [PATCH] hyper-v: Use UUID API for exporting the GUID - -There is export_guid() function which exports guid_t to the u8 array. -Use it instead of open coding variant. - -This allows to hide the uuid_t internals. - -Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Link: https://lore.kernel.org/r/20200422125937.38355-1-andriy.shevchenko@linux.intel.com -Signed-off-by: Wei Liu <wei.liu@kernel.org> ---- - drivers/hv/hv_trace.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h -index e70783e33680..f9d14db980cb 100644 ---- a/drivers/hv/hv_trace.h -+++ b/drivers/hv/hv_trace.h -@@ -286,8 +286,8 @@ TRACE_EVENT(vmbus_send_tl_connect_request, - __field(int, ret) - ), - TP_fast_assign( -- memcpy(__entry->guest_id, &msg->guest_endpoint_id.b, 16); -- memcpy(__entry->host_id, &msg->host_service_id.b, 16); -+ export_guid(__entry->guest_id, &msg->guest_endpoint_id); -+ export_guid(__entry->host_id, &msg->host_service_id); - __entry->ret = ret; - ), - TP_printk("sending guest_endpoint_id %pUl, host_service_id %pUl, " --- -2.26.2 - diff --git a/0001-ice-mark-driver-as-tech-preview.patch b/0001-ice-mark-driver-as-tech-preview.patch index 616f214b7..195250d2d 100644 --- a/0001-ice-mark-driver-as-tech-preview.patch +++ b/0001-ice-mark-driver-as-tech-preview.patch @@ -1,4 +1,4 @@ -From 52d598767290474a6f71d211330e3b4248ddb781 Mon Sep 17 00:00:00 2001 +From 11fb33167280b58dc0cffe19a587eedb6613f684 Mon Sep 17 00:00:00 2001 From: Jonathan Toppins <jtoppins@redhat.com> Date: Tue, 24 Jul 2018 19:17:40 -0400 Subject: [PATCH] ice: mark driver as tech-preview diff --git a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch index 67a6f2c3a..a179e88df 100644 --- a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch +++ b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch @@ -1,4 +1,4 @@ -From 218566d32f39ca1c892774f49dcae85d95fc0eec Mon Sep 17 00:00:00 2001 +From 2079f6582c6d6452aaa7556812ba791bc57e350f Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Mon, 20 May 2019 22:21:02 -0400 Subject: [PATCH] iommu/arm-smmu: workaround DMA mode issues diff --git a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch index e3f2a49f0..e264346aa 100644 --- a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch +++ b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch @@ -1,4 +1,4 @@ -From 963a502bcae780f892eb8845cf3e67e323bcfdd2 Mon Sep 17 00:00:00 2001 +From d95d6619d977e100897cc3102d3583c860d61e55 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Sun, 10 Feb 2019 01:27:54 +0000 Subject: [PATCH] ipmi: do not configure ipmi for HPE m400 diff --git a/0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch b/0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch index 1e0dfd521..189eb4b8c 100644 --- a/0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch +++ b/0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch @@ -1,4 +1,4 @@ -From 1bc24a4bd4f83a5c889a6d20a0955bc79d1adef0 Mon Sep 17 00:00:00 2001 +From cc719fb57dda1ae5b04fbd3ca5d75bfd2959931f Mon Sep 17 00:00:00 2001 From: Myron Stowe <myron.stowe@redhat.com> Date: Fri, 29 Jun 2018 20:05:41 -0400 Subject: [PATCH] kABI: Add generic kABI macros to use for kABI workarounds diff --git a/0001-kdump-add-support-for-crashkernel-auto.patch b/0001-kdump-add-support-for-crashkernel-auto.patch index 0c8fc087f..d1f3e22de 100644 --- a/0001-kdump-add-support-for-crashkernel-auto.patch +++ b/0001-kdump-add-support-for-crashkernel-auto.patch @@ -1,4 +1,4 @@ -From d3f8514a9c9c6026ad216d7b2067629f40dc800c Mon Sep 17 00:00:00 2001 +From e2b70229c9ad987ffe8d504aaa813d4a958d5706 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Tue, 23 Jul 2019 15:24:30 +0000 Subject: [PATCH] kdump: add support for crashkernel=auto diff --git a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch index 65afe885e..66e0f5f58 100644 --- a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch +++ b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch @@ -1,4 +1,4 @@ -From 7f3851416a724ebb9d88a3ef078f287850a5eb8f Mon Sep 17 00:00:00 2001 +From ccf77f28927e7779706ca9fee95ea78adac7db60 Mon Sep 17 00:00:00 2001 From: Dave Young <dyoung@redhat.com> Date: Tue, 12 Jun 2018 00:54:22 -0400 Subject: [PATCH] kdump: fix a grammar issue in a kernel message diff --git a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch index 182e5f5d1..f585c7650 100644 --- a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch +++ b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch @@ -1,4 +1,4 @@ -From b2c93f43182c7f1bf0b39dc45dba6b8032a780cb Mon Sep 17 00:00:00 2001 +From 3ec08d5a41a8bc1c10f2e8d2339b3635fe6aeba7 Mon Sep 17 00:00:00 2001 From: Dave Young <dyoung@redhat.com> Date: Mon, 4 Jun 2018 01:38:25 -0400 Subject: [PATCH] kdump: round up the total memory size to 128M for crashkernel diff --git a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch index cb10547d2..083d52cae 100644 --- a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch +++ b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch @@ -1,4 +1,4 @@ -From ce48b2292aed29bd47e3bc851493f44b1bcf5a00 Mon Sep 17 00:00:00 2001 +From b908f474303edc91346d0637b87b5b0f4dbcaa90 Mon Sep 17 00:00:00 2001 From: Tomas Henzl <thenzl@redhat.com> Date: Thu, 9 Aug 2018 13:44:15 -0400 Subject: [PATCH] kernel: add SUPPORT_REMOVED kernel taint diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch index 1655c8406..c68cd7a3f 100644 --- a/0001-megaraid_sas-remove-deprecated-pci-ids.patch +++ b/0001-megaraid_sas-remove-deprecated-pci-ids.patch @@ -1,4 +1,4 @@ -From 3d931d2e2d4867f33668b1684875af8ab469644d Mon Sep 17 00:00:00 2001 +From 4f09211c5b6bc3d1cd024318afa0b126186785aa Mon Sep 17 00:00:00 2001 From: Tomas Henzl <thenzl@redhat.com> Date: Thu, 2 Jan 2020 14:24:37 -0500 Subject: [PATCH] megaraid_sas: remove deprecated pci-ids diff --git a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch index aebdbaa59..f26cf3d75 100644 --- a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch +++ b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch @@ -1,4 +1,4 @@ -From c6881085d569397f100a0bcfd7d3c9e768765d43 Mon Sep 17 00:00:00 2001 +From 5630751c3c96a04dfd84f7112f1bc3e23c2ed3fe Mon Sep 17 00:00:00 2001 From: Murphy Zhou <jencce.kernel@gmail.com> Date: Sun, 29 Sep 2019 17:56:59 +0800 Subject: [PATCH] mm/kmemleak: skip late_init if not skip disable diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch index d25bf6f87..9b0ee0fa9 100644 --- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch +++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch @@ -1,4 +1,4 @@ -From b456dc06e4aef2e143fe305036c45285a273d5bf Mon Sep 17 00:00:00 2001 +From c1216b2d2077baa195f751e322f993df73853eb0 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Mon, 7 Jan 2019 21:03:10 +0000 Subject: [PATCH] modules: add rhelversion MODULE_INFO tag diff --git a/0001-mpt-remove-certain-deprecated-pci-ids.patch b/0001-mpt-remove-certain-deprecated-pci-ids.patch index 4e1828681..bd837e917 100644 --- a/0001-mpt-remove-certain-deprecated-pci-ids.patch +++ b/0001-mpt-remove-certain-deprecated-pci-ids.patch @@ -1,4 +1,4 @@ -From dd81db78f191a07b7bcb9f2d48e160e3d30ea9a9 Mon Sep 17 00:00:00 2001 +From 88dd238eae952ca3346c755c4d6ad357f599e596 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Thu, 2 Jan 2020 14:24:36 -0500 Subject: [PATCH] mpt*: remove certain deprecated pci-ids diff --git a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch index ca7fc332f..b8aa9c6b4 100644 --- a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch +++ b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch @@ -1,4 +1,4 @@ -From f1fb8712d440431c0b221d1d10bdec27550a4a9a Mon Sep 17 00:00:00 2001 +From c1395d948a94f6e715997110987ff7b0f22af23a Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:46 -0500 Subject: [PATCH] mptsas: Taint kernel if mptsas is loaded diff --git a/0001-mptsas-pci-id-table-changes.patch b/0001-mptsas-pci-id-table-changes.patch index 8090136b3..304f236f6 100644 --- a/0001-mptsas-pci-id-table-changes.patch +++ b/0001-mptsas-pci-id-table-changes.patch @@ -1,4 +1,4 @@ -From 66242ae1003c4e14ab4d387d0564e5efbce19967 Mon Sep 17 00:00:00 2001 +From adbf6884bafa3bea7e85e40b12814ee0a946085b Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:47 -0500 Subject: [PATCH] mptsas: pci-id table changes diff --git a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch index 66a232739..131ed1a28 100644 --- a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch +++ b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch @@ -1,4 +1,4 @@ -From a20cfe698ffe588e73e07136b541583b0833234c Mon Sep 17 00:00:00 2001 +From 351e3a04568dc0530910ca5062462d83273be3b0 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:48 -0500 Subject: [PATCH] mptspi: Taint kernel if mptspi is loaded diff --git a/0001-mptspi-pci-id-table-changes.patch b/0001-mptspi-pci-id-table-changes.patch index 73513eafc..0852e640f 100644 --- a/0001-mptspi-pci-id-table-changes.patch +++ b/0001-mptspi-pci-id-table-changes.patch @@ -1,4 +1,4 @@ -From a25d3df35a900f390843af39833f8dc0da299b33 Mon Sep 17 00:00:00 2001 +From 94398f8f80dbf2540d14833cd4947f3d15d45620 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:45 -0500 Subject: [PATCH] mptspi: pci-id table changes diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch index 3155ec6f2..9861090f2 100644 --- a/0001-put-RHEL-info-into-generated-headers.patch +++ b/0001-put-RHEL-info-into-generated-headers.patch @@ -1,4 +1,4 @@ -From 3a44134dab941b6ba821e8171b2cdc87c0c2c10b Mon Sep 17 00:00:00 2001 +From e48ea380fdb9d7eaf89926fcf1d16e3cb6f2f1aa Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Mon, 7 Jan 2019 20:55:21 +0000 Subject: [PATCH] put RHEL info into generated headers diff --git a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch index deafc0cde..54100e113 100644 --- a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch +++ b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch @@ -1,4 +1,4 @@ -From 49529eec47168fa4629d8a354e46558155e5d9a3 Mon Sep 17 00:00:00 2001 +From 7aa3a90aa2a7d0555d6bd54bb2788e2599420553 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Thu, 2 Jan 2020 14:24:44 -0500 Subject: [PATCH] qla2xxx: Remove PCI IDs of deprecated adapter diff --git a/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch index e2b390fcb..07fcfdaf5 100644 --- a/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch +++ b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch @@ -1,4 +1,4 @@ -From 49dc296b17ca741f2e640ff293e25a5d0bd09345 Mon Sep 17 00:00:00 2001 +From 286affd0600965905d3d08b4874b92e33655a4cf Mon Sep 17 00:00:00 2001 From: Chad Dupuis <cdupuis@redhat.com> Date: Thu, 2 Jan 2020 14:24:39 -0500 Subject: [PATCH] qla4xxx: Remove deprecated PCI IDs from RHEL 8 diff --git a/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch b/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch index a19695400..ac26b8cc5 100644 --- a/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch +++ b/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch @@ -1,4 +1,4 @@ -From b4381a9988f3858bb42421917c8cc8feb34a884b Mon Sep 17 00:00:00 2001 +From ff2bfe18f5c3d13b30c46ba4524521d88c5775a1 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava <prarit@redhat.com> Date: Wed, 19 Feb 2020 11:52:16 +0100 Subject: [PATCH] redhat: rh_kabi: Add macros to size and extend structs diff --git a/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch b/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch index 6df231705..91c30fa79 100644 --- a/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch +++ b/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch @@ -1,4 +1,4 @@ -From 809f51b4af64f36079bd23cf3e352b8d2a2965f3 Mon Sep 17 00:00:00 2001 +From 0499c4ffab431c14e2bc121a3e089a80aafb8438 Mon Sep 17 00:00:00 2001 From: Tony Camuso <tcamuso@redhat.com> Date: Wed, 19 Feb 2020 11:52:17 +0100 Subject: [PATCH] redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference diff --git a/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch b/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch index 16285a5da..c96a290b4 100644 --- a/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch +++ b/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch @@ -1,4 +1,4 @@ -From 45061886c47a7860542a86b963678ec29c47cc5d Mon Sep 17 00:00:00 2001 +From d6b630cde6eaede7cc1507ac7235f215c715e830 Mon Sep 17 00:00:00 2001 From: Don Dutile <ddutile@redhat.com> Date: Wed, 19 Feb 2020 11:52:18 +0100 Subject: [PATCH] redhat: rh_kabi: Indirect EXTEND macros so nesting of other diff --git a/0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch b/0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch index 9ec32cbe6..444ec257f 100644 --- a/0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch +++ b/0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch @@ -1,4 +1,4 @@ -From 0217bb42684a8085dcdd3ada4f327c2aaea0c63d Mon Sep 17 00:00:00 2001 +From e6ef513b925e6659fa05a8eab719be7ca70955ca Mon Sep 17 00:00:00 2001 From: Jiri Benc <jbenc@redhat.com> Date: Wed, 19 Feb 2020 11:52:20 +0100 Subject: [PATCH] redhat: rh_kabi add a comment with warning about diff --git a/0001-redhat-rh_kabi-deduplication-friendly-structs.patch b/0001-redhat-rh_kabi-deduplication-friendly-structs.patch index 21c8f3f35..4e2c562fe 100644 --- a/0001-redhat-rh_kabi-deduplication-friendly-structs.patch +++ b/0001-redhat-rh_kabi-deduplication-friendly-structs.patch @@ -1,4 +1,4 @@ -From 00b2e955dee40b2ad0458db90006133fe2c0206f Mon Sep 17 00:00:00 2001 +From 91c23fffe0d253ad886fc37ea48699da4d8a8b57 Mon Sep 17 00:00:00 2001 From: Jiri Benc <jbenc@redhat.com> Date: Wed, 19 Feb 2020 11:52:21 +0100 Subject: [PATCH] redhat: rh_kabi: deduplication friendly structs diff --git a/0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch b/0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch index fb27c3135..4d285f306 100644 --- a/0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch +++ b/0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch @@ -1,4 +1,4 @@ -From 8000b947964c348483343fb089a602ee0053280f Mon Sep 17 00:00:00 2001 +From a8252efaf2606fc1af9e92a4a478fb8527600a65 Mon Sep 17 00:00:00 2001 From: Jiri Benc <jbenc@redhat.com> Date: Wed, 19 Feb 2020 11:52:19 +0100 Subject: [PATCH] redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE diff --git a/0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch b/0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch index d767524f4..99b4c21a6 100644 --- a/0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch +++ b/0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch @@ -1,4 +1,4 @@ -From 34fd7679faeb3f9d3b99858605281e6a03f80f4f Mon Sep 17 00:00:00 2001 +From bd652e7924bd75011a512f07906525d639496114 Mon Sep 17 00:00:00 2001 From: Jakub Racek <jracek@redhat.com> Date: Thu, 22 Nov 2018 12:59:45 +0100 Subject: [PATCH] rh_kabi: introduce RH_KABI_EXCLUDE diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch index 8902f2782..fce7a0492 100644 --- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch +++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch @@ -1,4 +1,4 @@ -From db74f99ab424ca420fab25638f5511773e27367e Mon Sep 17 00:00:00 2001 +From c92ea73c70a3035b7567f4c7454aa635444a4ddf Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Wed, 30 Oct 2019 14:37:49 +0000 Subject: [PATCH] s390: Lock down the kernel when the IPL secure flag is set diff --git a/0001-scsi-smartpqi-add-inspur-advantech-ids.patch b/0001-scsi-smartpqi-add-inspur-advantech-ids.patch index 619243bb4..caffec851 100644 --- a/0001-scsi-smartpqi-add-inspur-advantech-ids.patch +++ b/0001-scsi-smartpqi-add-inspur-advantech-ids.patch @@ -1,4 +1,4 @@ -From fc7645542112eff2d5d8c83c44e00d12eb52602b Mon Sep 17 00:00:00 2001 +From eec267f480e4a9e1456234ad577694c943da4840 Mon Sep 17 00:00:00 2001 From: Don Brace <dbrace@redhat.com> Date: Mon, 16 Jul 2018 19:20:41 -0400 Subject: [PATCH] scsi: smartpqi: add inspur advantech ids diff --git a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch index cb82813cf..1b80ad2de 100644 --- a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch +++ b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch @@ -1,4 +1,4 @@ -From f34de46432880f7257fa0f9a07c98e0e6d900f13 Mon Sep 17 00:00:00 2001 +From 99c68ceb43dae9ad99dd566759d5c0848c561266 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Mon, 30 Sep 2019 21:22:47 +0000 Subject: [PATCH] security: lockdown: expose a hook to lock the kernel down diff --git a/0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch b/0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch index ed12e83e7..c8176d054 100644 --- a/0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch +++ b/0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch @@ -1,4 +1,4 @@ -From b6aff2bb1f0f656dd709f23cf63be8a242207e96 Mon Sep 17 00:00:00 2001 +From 0c6b9e29442e5b3da3ef156c75206f29a9cc2e52 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Date: Tue, 10 Mar 2020 13:52:39 +0100 Subject: [PATCH] soc: bcm2835: Sync xHCI reset firmware property with diff --git a/0001-tags.sh-Ignore-redhat-rpm.patch b/0001-tags.sh-Ignore-redhat-rpm.patch index 673631b3b..d7eea17b7 100644 --- a/0001-tags.sh-Ignore-redhat-rpm.patch +++ b/0001-tags.sh-Ignore-redhat-rpm.patch @@ -1,4 +1,4 @@ -From 648db60b577e219a7a60f00f476bd271bd1a3c22 Mon Sep 17 00:00:00 2001 +From a69c4e224e80c1e894246ddb554834b4ea899481 Mon Sep 17 00:00:00 2001 From: Jeremy Cline <jcline@redhat.com> Date: Tue, 23 Jul 2019 15:26:09 +0000 Subject: [PATCH] tags.sh: Ignore redhat/rpm diff --git a/0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch b/0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch deleted file mode 100644 index be667bd95..000000000 --- a/0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 421f090c819d695942a470051cd624dc43deaf95 Mon Sep 17 00:00:00 2001 -From: Dexuan Cui <decui@microsoft.com> -Date: Mon, 20 Apr 2020 19:46:11 -0700 -Subject: [PATCH] x86/hyperv: Suspend/resume the VP assist page for hibernation - -Unlike the other CPUs, CPU0 is never offlined during hibernation, so in the -resume path, the "new" kernel's VP assist page is not suspended (i.e. not -disabled), and later when we jump to the "old" kernel, the page is not -properly re-enabled for CPU0 with the allocated page from the old kernel. - -So far, the VP assist page is used by hv_apic_eoi_write(), and is also -used in the case of nested virtualization (running KVM atop Hyper-V). - -For hv_apic_eoi_write(), when the page is not properly re-enabled, -hvp->apic_assist is always 0, so the HV_X64_MSR_EOI MSR is always written. -This is not ideal with respect to performance, but Hyper-V can still -correctly handle this according to the Hyper-V spec; nevertheless, Linux -still must update the Hyper-V hypervisor with the correct VP assist page -to prevent Hyper-V from writing to the stale page, which causes guest -memory corruption and consequently may have caused the hangs and triple -faults seen during non-boot CPUs resume. - -Fix the issue by calling hv_cpu_die()/hv_cpu_init() in the syscore ops. -Without the fix, hibernation can fail at a rate of 1/300 ~ 1/500. -With the fix, hibernation can pass a long-haul test of 2000 runs. - -In the case of nested virtualization, disabling/reenabling the assist -page upon hibernation may be unsafe if there are active L2 guests. -It looks KVM should be enhanced to abort the hibernation request if -there is any active L2 guest. - -Fixes: 05bd330a7fd8 ("x86/hyperv: Suspend/resume the hypercall page for hibernation") -Cc: stable@vger.kernel.org -Signed-off-by: Dexuan Cui <decui@microsoft.com> -Link: https://lore.kernel.org/r/1587437171-2472-1-git-send-email-decui@microsoft.com -Signed-off-by: Wei Liu <wei.liu@kernel.org> ---- - arch/x86/hyperv/hv_init.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c -index 624f5d9b0f79..fd51bac11b46 100644 ---- a/arch/x86/hyperv/hv_init.c -+++ b/arch/x86/hyperv/hv_init.c -@@ -73,7 +73,8 @@ static int hv_cpu_init(unsigned int cpu) - struct page *pg; - - input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg); -- pg = alloc_page(GFP_KERNEL); -+ /* hv_cpu_init() can be called with IRQs disabled from hv_resume() */ -+ pg = alloc_page(irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); - if (unlikely(!pg)) - return -ENOMEM; - *input_arg = page_address(pg); -@@ -254,6 +255,7 @@ static int __init hv_pci_init(void) - static int hv_suspend(void) - { - union hv_x64_msr_hypercall_contents hypercall_msr; -+ int ret; - - /* - * Reset the hypercall page as it is going to be invalidated -@@ -270,12 +272,17 @@ static int hv_suspend(void) - hypercall_msr.enable = 0; - wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); - -- return 0; -+ ret = hv_cpu_die(0); -+ return ret; - } - - static void hv_resume(void) - { - union hv_x64_msr_hypercall_contents hypercall_msr; -+ int ret; -+ -+ ret = hv_cpu_init(0); -+ WARN_ON(ret); - - /* Re-enable the hypercall page */ - rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); -@@ -288,6 +295,7 @@ static void hv_resume(void) - hv_hypercall_pg_saved = NULL; - } - -+/* Note: when the ops are called, only CPU0 is online and IRQs are disabled. */ - static struct syscore_ops hv_syscore_ops = { - .suspend = hv_suspend, - .resume = hv_resume, --- -2.26.2 - diff --git a/Makefile.rhelver b/Makefile.rhelver new file mode 100644 index 000000000..7fb2464bc --- /dev/null +++ b/Makefile.rhelver @@ -0,0 +1,45 @@ +RHEL_MAJOR = 8 +RHEL_MINOR = 99 + +# +# RHEL_RELEASE +# ------------- +# +# Represents build number in 'release' part of RPM's name-version-release. +# name is <package_name>, e.g. kernel +# version is upstream kernel version this kernel is based on, e.g. 4.18.0 +# release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8 +# +# Use this spot to avoid future merge conflicts. +# Do not trim this comment. +RHEL_RELEASE = 1 + +# +# Early y+1 numbering +# -------------------- +# +# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y +# First is RHEL_RELEASE inherited/merged from y as-is, second number +# is incremented with each build starting from 1. After merge from y, +# it resets back to 1. This way y+1 nvr reflects status of last merge. +# +# Example: +# +# rhel8.0 rhel-8.1 +# kernel-4.18.0-58.el8 --> kernel-4.18.0-58.1.el8 +# kernel-4.18.0-58.2.el8 +# kernel-4.18.0-59.el8 kernel-4.18.0-59.1.el8 +# kernel-4.18.0-60.el8 +# kernel-4.18.0-61.el8 --> kernel-4.18.0-61.1.el8 +# +# +# Use this spot to avoid future merge conflicts. +# Do not trim this comment. +EARLY_YSTREAM ?= no +EARLY_YBUILD:= +EARLY_YRELEASE:= +ifneq ("$(ZSTREAM)", "yes") + ifeq ("$(EARLY_YSTREAM)","yes") + RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE) + endif +endif @@ -1,15 +1,5 @@ 0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch 0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch -0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch -0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch -0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch -0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch -0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch -0001-hyper-v-Remove-internal-types-from-UAPI-header.patch -0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch -0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch -0001-btrfs-fix-block-group-leak-when-removing-fails.patch -0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch 0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch 0001-Add-Red-Hat-tainting.patch 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch diff --git a/kernel.spec b/kernel.spec index 26dc05a70..9dc9d0bb2 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.rc3.1 +%global distro_build 0.rc3.20200429git1d2cc5ac6f66.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,10 +69,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc3.1 +%define pkgrelease 0.rc3.20200429git1d2cc5ac6f66.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200429git1d2cc5ac6f66.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -163,7 +163,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 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.7 @@ -568,7 +568,9 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.7-rc3.tar.xz +Source0: linux-20200429git1d2cc5ac6f66.tar.xz + +Source1: Makefile.rhelver # Name of the packaged file containing signing key @@ -703,94 +705,82 @@ Source4000: README.rst ## Patches needed for building this package -Patch1: patch-%{rpmversion}-redhat.patch - %if !%{nopatches} Patch2: 0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch Patch3: 0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch -Patch4: 0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch -Patch5: 0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch -Patch6: 0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch -Patch7: 0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch -Patch8: 0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch -Patch9: 0001-hyper-v-Remove-internal-types-from-UAPI-header.patch -Patch10: 0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch -Patch11: 0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch -Patch12: 0001-btrfs-fix-block-group-leak-when-removing-fails.patch -Patch13: 0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch -Patch14: 0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch -Patch15: 0001-Add-Red-Hat-tainting.patch -Patch16: 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch -Patch17: 0001-modules-add-rhelversion-MODULE_INFO-tag.patch -Patch18: 0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch -Patch19: 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch -Patch20: 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch -Patch21: 0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch -Patch22: 0001-kdump-add-support-for-crashkernel-auto.patch -Patch23: 0001-put-RHEL-info-into-generated-headers.patch -Patch24: 0001-tags.sh-Ignore-redhat-rpm.patch -Patch25: 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch -Patch26: 0001-add-Red-Hat-specific-taint-flags.patch -Patch27: 0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch -Patch28: 0001-bpf-Add-tech-preview-taint-for-syscall.patch -Patch29: 0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch -Patch30: 0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch -Patch31: 0001-add-pci_hw_vendor_status.patch -Patch32: 0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch -Patch33: 0001-ice-mark-driver-as-tech-preview.patch -Patch34: 0001-scsi-smartpqi-add-inspur-advantech-ids.patch -Patch35: 0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch -Patch36: 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch -Patch37: 0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch -Patch38: 0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch -Patch39: 0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch -Patch40: 0001-Add-support-for-deprecating-processors.patch -Patch41: 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch -Patch42: 0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch -Patch43: 0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch -Patch44: 0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch -Patch45: 0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch -Patch46: 0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch -Patch47: 0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch -Patch48: 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch -Patch49: 0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch -Patch50: 0001-mpt-remove-certain-deprecated-pci-ids.patch -Patch51: 0001-megaraid_sas-remove-deprecated-pci-ids.patch -Patch52: 0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch -Patch53: 0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch -Patch54: 0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch -Patch55: 0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch -Patch56: 0001-be2iscsi-remove-unsupported-device-IDs.patch -Patch57: 0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch -Patch58: 0001-mptspi-pci-id-table-changes.patch -Patch59: 0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch -Patch60: 0001-mptsas-pci-id-table-changes.patch -Patch61: 0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch -Patch62: 0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch -Patch63: 0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch -Patch64: 0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch -Patch65: 0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch -Patch66: 0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch -Patch67: 0001-redhat-rh_kabi-deduplication-friendly-structs.patch -Patch68: 0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch -Patch69: 0001-ARM-tegra-usb-no-reset.patch -Patch70: 0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch -Patch71: 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch -Patch72: 0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch -Patch73: 0001-Drop-that-for-now.patch -Patch74: 0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch -Patch75: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch -Patch76: 0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch -Patch77: 0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch -Patch78: 0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch -Patch79: 0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch -Patch80: 0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch -Patch81: 0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch -Patch82: 0001-drm-panel-add-Xingbangda-XBD599-panel.patch -Patch83: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch -Patch84: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch -Patch85: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch +Patch4: 0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch +Patch5: 0001-Add-Red-Hat-tainting.patch +Patch6: 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch +Patch7: 0001-modules-add-rhelversion-MODULE_INFO-tag.patch +Patch8: 0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch +Patch9: 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch +Patch10: 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +Patch11: 0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch +Patch12: 0001-kdump-add-support-for-crashkernel-auto.patch +Patch13: 0001-put-RHEL-info-into-generated-headers.patch +Patch14: 0001-tags.sh-Ignore-redhat-rpm.patch +Patch15: 0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch +Patch16: 0001-add-Red-Hat-specific-taint-flags.patch +Patch17: 0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch +Patch18: 0001-bpf-Add-tech-preview-taint-for-syscall.patch +Patch19: 0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch +Patch20: 0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch +Patch21: 0001-add-pci_hw_vendor_status.patch +Patch22: 0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch +Patch23: 0001-ice-mark-driver-as-tech-preview.patch +Patch24: 0001-scsi-smartpqi-add-inspur-advantech-ids.patch +Patch25: 0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch +Patch26: 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch +Patch27: 0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch +Patch28: 0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch +Patch29: 0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch +Patch30: 0001-Add-support-for-deprecating-processors.patch +Patch31: 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +Patch32: 0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch +Patch33: 0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch +Patch34: 0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch +Patch35: 0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +Patch36: 0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch +Patch37: 0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +Patch38: 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +Patch39: 0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch +Patch40: 0001-mpt-remove-certain-deprecated-pci-ids.patch +Patch41: 0001-megaraid_sas-remove-deprecated-pci-ids.patch +Patch42: 0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch +Patch43: 0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch +Patch44: 0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch +Patch45: 0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch +Patch46: 0001-be2iscsi-remove-unsupported-device-IDs.patch +Patch47: 0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch +Patch48: 0001-mptspi-pci-id-table-changes.patch +Patch49: 0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch +Patch50: 0001-mptsas-pci-id-table-changes.patch +Patch51: 0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch +Patch52: 0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch +Patch53: 0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch +Patch54: 0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch +Patch55: 0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch +Patch56: 0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch +Patch57: 0001-redhat-rh_kabi-deduplication-friendly-structs.patch +Patch58: 0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch +Patch59: 0001-ARM-tegra-usb-no-reset.patch +Patch60: 0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch +Patch61: 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +Patch62: 0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch +Patch63: 0001-Drop-that-for-now.patch +Patch64: 0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch +Patch65: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch +Patch66: 0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch +Patch67: 0001-soc-bcm2835-Sync-xHCI-reset-firmware-property-with-d.patch +Patch68: 0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch +Patch69: 0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch +Patch70: 0001-USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch +Patch71: 0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch +Patch72: 0001-drm-panel-add-Xingbangda-XBD599-panel.patch +Patch73: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch +Patch74: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch +Patch75: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch %endif @@ -1286,27 +1276,16 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.7-rc3 -c -mv linux-5.7-rc3 linux-%{KVERREL} +%setup -q -n kernel-20200429git1d2cc5ac6f66 -c +mv linux-20200429git1d2cc5ac6f66 linux-%{KVERREL} cd linux-%{KVERREL} - -ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +cp -a %{SOURCE1} . %if !%{nopatches} ApplyOptionalPatch 0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch ApplyOptionalPatch 0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch -ApplyOptionalPatch 0001-Drivers-hv-vmbus-Fix-Suspend-to-Idle-for-Generation-.patch -ApplyOptionalPatch 0001-btrfs-discard-Use-the-correct-style-for-SPDX-License.patch -ApplyOptionalPatch 0001-Drivers-hv-Move-AEOI-determination-to-architecture-d.patch -ApplyOptionalPatch 0001-x86-hyperv-Suspend-resume-the-VP-assist-page-for-hib.patch -ApplyOptionalPatch 0001-hyper-v-Use-UUID-API-for-exporting-the-GUID.patch -ApplyOptionalPatch 0001-hyper-v-Remove-internal-types-from-UAPI-header.patch -ApplyOptionalPatch 0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch -ApplyOptionalPatch 0001-btrfs-drop-logs-when-we-ve-aborted-a-transaction.patch -ApplyOptionalPatch 0001-btrfs-fix-block-group-leak-when-removing-fails.patch -ApplyOptionalPatch 0001-btrfs-fix-transaction-leak-in-btrfs_recover_relocati.patch ApplyOptionalPatch 0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch ApplyOptionalPatch 0001-Add-Red-Hat-tainting.patch ApplyOptionalPatch 0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch @@ -2786,11 +2765,13 @@ fi # # %changelog -* Wed Apr 29 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.7.0-0.rc3.20200428git51184ae37e05.1] -- 51184ae37e05 rebase +* Wed Apr 29 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200429git1d2cc5ac6f66.1] +- 1d2cc5ac6f66 rebase - Add cec to the filter overrides ("Justin M. Forbes") - Add overrides to filter-modules.sh ("Justin M. Forbes") +- Copy Makefile.rhelver as a source file rather than a patch (Jeremy Cline) - Move the sed to clear the patch templating outside of conditionals ("Justin M. Forbes") +- Only include open merge requests with "Include in Releases" label (Jeremy Cline) - Exit non-zero if the tag already exists for a release (Jeremy Cline) - Adjust the changelog update script to not push anything (Jeremy Cline) - Drop --target noarch from the rh-rpms make target (Jeremy Cline) diff --git a/patch-5.7.0-redhat.patch b/patch-5.7.0-redhat.patch deleted file mode 100644 index 67f52c2b4..000000000 --- a/patch-5.7.0-redhat.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8474ffe83a89d7b5d2c6515875a308ff682df6f9 Mon Sep 17 00:00:00 2001 -From: Kernel Team <kernel-team@fedoraproject.org> -Date: Wed, 29 Apr 2020 08:56:58 -0500 -Subject: [PATCH] Include Makefile.rhelver - -Used to set the RHEL version. ---- - Makefile.rhelver | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/Makefile.rhelver b/Makefile.rhelver -new file mode 100644 -index 000000000000..7fb2464bc6de ---- /dev/null -+++ b/Makefile.rhelver -@@ -0,0 +1,45 @@ -+RHEL_MAJOR = 8 -+RHEL_MINOR = 99 -+ -+# -+# RHEL_RELEASE -+# ------------- -+# -+# Represents build number in 'release' part of RPM's name-version-release. -+# name is <package_name>, e.g. kernel -+# version is upstream kernel version this kernel is based on, e.g. 4.18.0 -+# release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8 -+# -+# Use this spot to avoid future merge conflicts. -+# Do not trim this comment. -+RHEL_RELEASE = 1 -+ -+# -+# Early y+1 numbering -+# -------------------- -+# -+# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y -+# First is RHEL_RELEASE inherited/merged from y as-is, second number -+# is incremented with each build starting from 1. After merge from y, -+# it resets back to 1. This way y+1 nvr reflects status of last merge. -+# -+# Example: -+# -+# rhel8.0 rhel-8.1 -+# kernel-4.18.0-58.el8 --> kernel-4.18.0-58.1.el8 -+# kernel-4.18.0-58.2.el8 -+# kernel-4.18.0-59.el8 kernel-4.18.0-59.1.el8 -+# kernel-4.18.0-60.el8 -+# kernel-4.18.0-61.el8 --> kernel-4.18.0-61.1.el8 -+# -+# -+# Use this spot to avoid future merge conflicts. -+# Do not trim this comment. -+EARLY_YSTREAM ?= no -+EARLY_YBUILD:= -+EARLY_YRELEASE:= -+ifneq ("$(ZSTREAM)", "yes") -+ ifeq ("$(EARLY_YSTREAM)","yes") -+ RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE) -+ endif -+endif --- -2.26.0 - @@ -1,3 +1,3 @@ -SHA512 (linux-5.7-rc3.tar.xz) = 8737a7534fc01259ab9c374fa55edd39a13cd1a36126b38ad48a0aeb4a360988dca2523d812056a0dc080fc5c79e211dd91f20a750a6531c8039b980cb25479f -SHA512 (kernel-abi-whitelists-5.7.0-0.rc3.1.tar.bz2) = c89a7b8816a7fedfea587f971ad61d9196cbb82be86d0e56c927bcc1762ea1ca0356ab091a278586a633ebe057c086edc5f3c6fbab5f107d6f2a7714c34ea14c -SHA512 (kernel-kabi-dw-5.7.0-0.rc3.1.tar.bz2) = 053943ccbd1a3f03c358f42085267045e03579c84c53e774156cc2ff91a5efd0b31c7c3fc8c28dda31b2a4735254cd5e15fbfa62f967ec92cd80b01c3441c981 +SHA512 (linux-20200429git1d2cc5ac6f66.tar.xz) = 3e68ece6b55d99cf4d8d8f22c77eb08146f33c566ce9ed3541994a7007c49e10c6f1537e103ba83cd0fbcd49c7dc567510b614e8dd4eadcd568eeda71ed983b7 +SHA512 (kernel-abi-whitelists-5.7.0-0.rc3.20200429git1d2cc5ac6f66.1.tar.bz2) = dea54f5fb67c619ab0535c130c60b49138214c5657ffb3f088660be97457443ff320ecb955d42046d3f8698aa92220ac97bf205900df4823ed869324ac87e0c7 +SHA512 (kernel-kabi-dw-5.7.0-0.rc3.20200429git1d2cc5ac6f66.1.tar.bz2) = 11d43b005f4f96ef432343ae4bf4bf410838c0986bacc9397fc8689bc7e98fae68fafbbc1fd7ebf69e95007d45c39193be0b0216f6a20a1b7cdcf54f87c0072d |