Delete outdated patch

SOURCES/debrand-rh_taint.patch

@@ -1,81 +0,0 @@
---- a/kernel/rh_taint.c	2020-10-16 10:41:51.000000000 -0500
-+++ b/kernel/rh_taint.c	2020-11-19 10:50:24.853039167 -0600
-@@ -2,12 +2,12 @@
- #include <linux/module.h>
- 
- /*
-- * The following functions are used by Red Hat to indicate to users that
-- * hardware and drivers are unsupported, or have limited support in RHEL major
-+ * The following functions are used by AlmaLinux to indicate to users that
-+ * hardware and drivers are unsupported, or have limited support in AlmaLinux major
-  * and minor releases.  These functions output loud warning messages to the end
-  * user and should be USED WITH CAUTION.
-  *
-- * Any use of these functions _MUST_ be documented in the RHEL Release Notes,
-+ * Any use of these functions _MUST_ be documented in the AlmaLinux Release Notes,
-  * and have approval of management.
-  */
- 
-@@ -16,15 +16,15 @@
-  * @msg: Hardware name, class, or type
-  *
-  * Called to mark a device, class of devices, or types of devices as not having
-- * support in any RHEL minor release.  This does not TAINT the kernel.  Red Hat
-- * will not fix bugs against this hardware in this minor release.  Red Hat may
-+ * support in any AlmaLinux minor release.  This does not TAINT the kernel.  AlmaLinux
-+ * will not fix bugs against this hardware in this minor release.  AlmaLinux may
-  * declare support in a future major or minor update release.  This cannot be
-  * used to mark drivers unsupported.
-  */
- void mark_hardware_unsupported(const char *msg)
- {
- 	/* Print one single message */
--	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://catalog.redhat.com for certified hardware.\n", msg);
-+	pr_crit("Warning: %s - this hardware has not undergone testing by AlmaLinux and might not be certified.\n", msg);
- }
- EXPORT_SYMBOL(mark_hardware_unsupported);
- 
-@@ -35,12 +35,12 @@ EXPORT_SYMBOL(mark_hardware_unsupported)
-  * Called to minimize the support status of a previously supported device in
-  * a minor release.  This does not TAINT the kernel.  Marking hardware
-  * deprecated is usually done in conjunction with the hardware vendor.  Future
-- * RHEL major releases may not include this driver.  Driver updates and fixes
-+ * AlmaLinux major releases may not include this driver.  Driver updates and fixes
-  * for this device will be limited to critical issues in future minor releases.
-  */
- void mark_hardware_deprecated(const char *msg)
- {
--	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this RHEL release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact Red Hat Support or your device's hardware vendor for additional information.\n", msg);
-+	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this AlmaLinux release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact AlmaLinux Support or your device's hardware vendor for additional information.\n", msg);
- }
- EXPORT_SYMBOL(mark_hardware_deprecated);
- 
-@@ -50,9 +50,9 @@ EXPORT_SYMBOL(mark_hardware_deprecated);
-  *
-  * Called to minimize the support status of a new driver.  This does TAINT the
-  * kernel.  Calling this function indicates that the driver or subsystem has
-- * had limited testing and is not marked for full support within this RHEL
-- * minor release.  The next RHEL minor release may contain full support for
-- * this driver.  Red Hat does not guarantee that bugs reported against this
-+ * had limited testing and is not marked for full support within this AlmaLinux
-+ * minor release.  The next AlmaLinux minor release may contain full support for
-+ * this driver.  AlmaLinux does not guarantee that bugs reported against this
-  * driver or subsystem will be resolved.
-  */
- void mark_tech_preview(const char *msg, struct module *mod)
-@@ -81,13 +81,13 @@ EXPORT_SYMBOL(mark_tech_preview);
-  * mark_driver_unsupported - drivers that we know we don't want to support
-  * @name: the name of the driver
-  *
-- * In some cases Red Hat has chosen to build a driver for internal QE
-+ * In some cases AlmaLinux has chosen to build a driver for internal QE
-  * use. Use this function to mark those drivers as unsupported for
-  * customers.
-  */
- void mark_driver_unsupported(const char *name)
- {
--	pr_crit("Warning: %s - This driver has not undergone sufficient testing by Red Hat for this release and therefore cannot be used in production systems.\n",
-+	pr_crit("Warning: %s - This driver has not undergone sufficient testing by AlmaLinux for this release and therefore cannot be used in production systems.\n",
- 	        name ? name : "kernel");
- }
- EXPORT_SYMBOL(mark_driver_unsupported);

SPECS/kernel.spec

@@ -537,7 +537,6 @@ Source9000: almalinux.pem
 Patch999999: linux-kernel-test.patch
 
 Patch1000: debrand-single-cpu.patch
-Patch1001: debrand-rh_taint.patch
 Patch1002: debrand-rh-i686-cpu.patch
 
 # END OF PATCH DEFINITIONS
@@ -1090,7 +1089,6 @@ mv linux-%{rpmversion}-%{pkgrelease} linux-%{KVERREL}
 cd linux-%{KVERREL}
 
 ApplyOptionalPatch debrand-single-cpu.patch
-ApplyOptionalPatch debrand-rh_taint.patch
 ApplyOptionalPatch debrand-rh-i686-cpu.patch
 ApplyOptionalPatch linux-kernel-test.patch
 
@@ -14057,15 +14055,7 @@ fi
 - drm/nouveau/kms/nv50: workaround EFI GOP window channel format differences (Ben Skeggs) [1997878]
 - drm/nouveau/disp: power down unused DP links during init (Ben Skeggs) [1997878]
 - drm/nouveau: recognise GA107 (Ben Skeggs) [1997878]
-<<<<<<< HEAD
-
-* Sat Oct 02 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-347.el8]
 - PCI: Mark TI C667X to avoid bus reset (Alex Williamson) [1975768]
-
-* Fri Oct 01 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-346.el8]
-=======
-- PCI: Mark TI C667X to avoid bus reset (Alex Williamson) [1975768]
->>>>>>> c8-beta
 - redhat: switch secureboot kernel image signing to release keys (Bruno Meneguele)
 - CI: handle RT branches in a single config (Veronika Kabatova)
 - CI: Fix RT check branch name (Veronika Kabatova)