Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc6.46.vanilla.1.fc37kernel-5.19.0-0.rc6.46.vanilla.1.fc36kernel-5.19.0-0.rc6.46.vanilla.1.fc35

5 files changed, 9 insertions, 59 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4a0e64b52..aea44c38e 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 44
+RHEL_RELEASE = 46
 
 #
 # ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index c67d3c1b5..88c081118 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,6 +1,3 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c3692ed0c8d78cf9579149de1e06bf5ec9e91ea6
- c3692ed0c8d78cf9579149de1e06bf5ec9e91ea6 drm/aperture: Run fbdev removal before internal helpers
-
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/297bcb88233101e8d5062729ff3a5f989bad1c3b
  297bcb88233101e8d5062729ff3a5f989bad1c3b Revert "crypto: rng - Override drivers/char/random in FIPS mode"
 
diff --git a/kernel.spec b/kernel.spec
index 661425535..83d88f2b1 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,13 +128,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 5.19.0
 %define patchversion 5.19
-%define pkgrelease 0.rc5.20220708gite8a4e1c1bb69.44
+%define pkgrelease 0.rc6.46
 %define kversion 5
-%define tarfile_release 5.19-rc5-187-ge8a4e1c1bb69
+%define tarfile_release 5.19-rc6
 # This is needed to do merge window version magic
 %define patchlevel 19
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20220708gite8a4e1c1bb69.44%{?buildid}%{?dist}
+%define specrelease 0.rc6.46%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 5.19.0
 
@@ -3145,9 +3145,6 @@ fi
 #
 #
 %changelog
-* Fri Jul 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc5.e8a4e1c1bb69.43]
-- drm/aperture: Run fbdev removal before internal helpers (Thomas Zimmermann)
-
 * Thu Jul 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc5.9f09069cde34.41]
 - Fedora 5.19 configs pt 1 (Justin M. Forbes)
 - redhat: Exclude cpufreq.h from kernel-headers (Patrick Talbert)
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index b75f3a82c..136319beb 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -19,7 +19,6 @@
  drivers/firmware/efi/Makefile                      |   1 +
  drivers/firmware/efi/efi.c                         | 124 +++--
  drivers/firmware/efi/secureboot.c                  |  38 ++
- drivers/gpu/drm/drm_aperture.c                     |  26 +-
  drivers/hid/hid-rmi.c                              |  64 ---
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 +
  drivers/input/rmi4/rmi_driver.c                    | 124 +++--
@@ -65,7 +64,7 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 67 files changed, 1559 insertions(+), 198 deletions(-)
+ 66 files changed, 1544 insertions(+), 187 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index 2522b11e593f..852307b46301 100644
@@ -121,7 +120,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 990d2ee79186..77bce7a7dc7c 100644
+index faa4880f25f7..6135cccdcf3f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -749,49 +748,6 @@ index 000000000000..de0a3714a5d4
 +		}
 +	}
 +}
-diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
-index 74bd4a76b253..059fd71424f6 100644
---- a/drivers/gpu/drm/drm_aperture.c
-+++ b/drivers/gpu/drm/drm_aperture.c
-@@ -329,7 +329,20 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
- 						     const struct drm_driver *req_driver)
- {
- 	resource_size_t base, size;
--	int bar, ret = 0;
-+	int bar, ret;
-+
-+	/*
-+	 * WARNING: Apparently we must kick fbdev drivers before vgacon,
-+	 * otherwise the vga fbdev driver falls over.
-+	 */
-+#if IS_REACHABLE(CONFIG_FB)
-+	ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
-+	if (ret)
-+		return ret;
-+#endif
-+	ret = vga_remove_vgacon(pdev);
-+	if (ret)
-+		return ret;
-
- 	for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
- 		if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
-@@ -339,15 +352,6 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
- 		drm_aperture_detach_drivers(base, size);
- 	}
-
--	/*
--	 * WARNING: Apparently we must kick fbdev drivers before vgacon,
--	 * otherwise the vga fbdev driver falls over.
--	 */
--#if IS_REACHABLE(CONFIG_FB)
--	ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
--#endif
--	if (ret == 0)
--		ret = vga_remove_vgacon(pdev);
--	return ret;
-+	return 0;
- }
- EXPORT_SYMBOL(drm_aperture_remove_conflicting_pci_framebuffers);
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 311eee599ce9..2460c6bd46f8 100644
 --- a/drivers/hid/hid-rmi.c
diff --git a/sources b/sources
index d65dfb50e..411d6186f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19-rc5-187-ge8a4e1c1bb69.tar.xz) = be28ed9e4704530f700d203c4e32179ac2b994d80f53e904d09edace7103b3843bcb810b7130fcb19ee34d86cc0b2d7443a27958242095875190ee1a1d36ea57
-SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 69720536919c9ece7682a595162c19e5f6712c796362196253a32ebe48881256f418c446464b4ca684ef39adba785371b7b5b2c0412a1c854181c8eb259dde46
-SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 9ee2c1eaccc560c530a7c019f86dd87819dc23e4dad902165fcda2aba8b614d76fd88969d5ffcdec06f474a592df8b6b5038409686f4a6e796bc9269f5685c05
+SHA512 (linux-5.19-rc6.tar.xz) = abb0892041931fd3494550a554e34431aea80807edc4eac692931ca62a2970d6c426ae6fdd0a71a887b05d50a8f1a6960c4c8985b4d5d1be867b8892c5cb611b
+SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = e2ee5655fbfe2e2fa9ec13f79550a13a3002e52aadb55151d36ecf8ecb4ca2a8b853e4c6d68530cdbe77b9a68f83b2812c357404a478398bfb1b21425491c771
+SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 541d3c7f7c06a2d2d3fbc8724807c3b4fcaea4ed88bbb29cab14d9b355f3d243d89b69b342f8726c7da0627bb4873d8a1f5e2a7be41415935347562811cd6dd7