merge originkernel-6.1.7-150.vanilla.1.fc36

15 files changed, 35 insertions, 52 deletions

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 20a54d166..561aa507b 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2267,7 +2267,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 467096864..450fc3176 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2251,7 +2251,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 37906e0d1..789a01364 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2274,7 +2274,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 5f39e71ba..0c6b6c4ae 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2259,7 +2259,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b5713ef9c..2334016cf 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2228,7 +2228,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 35e339056..4ae54df15 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2213,7 +2213,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ef2efe4f0..0a0d9a4cb 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1775,7 +1775,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index f18aff41c..5a32ad583 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1758,7 +1758,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 2ec2d0f16..74b1830f8 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1783,7 +1783,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 40570f792..d8cbd3b17 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1766,7 +1766,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 55e0fea34..d268c87a6 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1942,7 +1942,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1987,7 +1987,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index ddc8fb03c..94bfe19ba 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1925,7 +1925,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1970,7 +1970,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
diff --git a/kernel.spec b/kernel.spec
index 44f2321a3..41aeea17e 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,17 +128,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 6.1.6
+%define specversion 6.1.7
 %define patchversion 6.1
 %define pkgrelease 150
 %define kversion 6
-%define tarfile_release 6.1.6
+%define tarfile_release 6.1.7
 # This is needed to do merge window version magic
 %define patchlevel 1
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 150%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.1.5
+%define kabiversion 6.1.7
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3184,6 +3184,13 @@ fi
 #
 #
 %changelog
+* Wed Jan 18 2023 Augusto Caringi <acaringi@redhat.com> [6.1.7-0]
+- enable efifb for Nvidia (Justin M. Forbes)
+- Linux v6.1.7
+
+* Sat Jan 14 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.6-0]
+- Linux v6.1.6
+
 * Thu Jan 12 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.5-0]
 - KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS (Jim Mattson)
 - Update module filters for nvmem_u-boot-env (Justin M. Forbes)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index c6e96e774..761ae0d03 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -21,7 +21,6 @@
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
  drivers/iommu/iommu.c                              |  22 ++++
- .../net/wireless/broadcom/brcm80211/brcmfmac/of.c  |   5 +-
  drivers/pci/quirks.c                               |  24 ++++
  drivers/usb/core/hub.c                             |   7 ++
  include/linux/efi.h                                |  22 ++--
@@ -37,10 +36,10 @@
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 39 files changed, 487 insertions(+), 182 deletions(-)
+ 38 files changed, 484 insertions(+), 180 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ddbd2fc917c5..db90bfc4f3ef 100644
+index 7eb6793ecfbf..c7e8be8b3a5f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -287,10 +286,10 @@ index c2c786eb95ab..4e3aa80cd5cf 100644
  	return ctx.rc;
  }
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index b47e93a24a9a..9d172e177a75 100644
+index dbfa58e799e2..69654a728e07 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1743,6 +1743,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1746,6 +1746,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
  	if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
  		return false;
 
@@ -409,7 +408,7 @@ index 8d151e332584..bd29fe4ddbf3 100644
  obj-$(CONFIG_EFI_RCI2_TABLE)		+= rci2-table.o
  obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE)	+= embedded-firmware.o
 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index f12cc29bd4b8..ec530425a457 100644
+index 033aac6be7da..28f9bf73368b 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -32,6 +32,7 @@
@@ -420,7 +419,7 @@ index f12cc29bd4b8..ec530425a457 100644
 
  #include <asm/early_ioremap.h>
 
-@@ -881,40 +882,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -884,40 +885,101 @@ int efi_mem_type(unsigned long phys_addr)
  }
  #endif
 
@@ -1018,29 +1017,6 @@ index 959d895fc1df..ced88384a6ee 100644
  /*
   * Changes the default domain of an iommu group that has *only* one device
   *
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
-index a83699de01ec..fdd0c9abc1a1 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
-@@ -79,7 +79,8 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
- 	/* Apple ARM64 platforms have their own idea of board type, passed in
- 	 * via the device tree. They also have an antenna SKU parameter
- 	 */
--	if (!of_property_read_string(np, "brcm,board-type", &prop))
-+	err = of_property_read_string(np, "brcm,board-type", &prop);
-+	if (!err)
- 		settings->board_type = prop;
-
- 	if (!of_property_read_string(np, "apple,antenna-sku", &prop))
-@@ -87,7 +88,7 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
-
- 	/* Set board-type to the first string of the machine compatible prop */
- 	root = of_find_node_by_path("/");
--	if (root && !settings->board_type) {
-+	if (root && err) {
- 		char *board_type;
- 		const char *tmp;
-
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 index 285acc4aaccc..a7056957e7dd 100644
 --- a/drivers/pci/quirks.c
@@ -1228,10 +1204,10 @@ index ca1b7109c0db..b947cfbf04c2 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index 94125d3b6893..7a6bf4659565 100644
+index 0c214af99085..060e927bddeb 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1685,7 +1685,7 @@ config AIO
+@@ -1689,7 +1689,7 @@ config AIO
  	  this option saves about 7k.
 
  config IO_URING
diff --git a/sources b/sources
index ddb6b2df4..c2192cbde 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1.5.tar.xz) = d4fb8559d96800aec0244f379ec9922f7e4adc746354664d140786584ebf34f9f18369ab04ade3435dcfb2ae61e82ece878d2721e4e4142d4c4d3b5140527db2
-SHA512 (kernel-abi-stablelists-6.1.5.tar.bz2) = 10fab3ad475055a0e3f98ccf6272d2626952952a86e56e6239743cd692ea340953afd188073d4cdfe65b064a1b638856003bd02f726f17f284b454ff15bc930e
-SHA512 (kernel-kabi-dw-6.1.5.tar.bz2) = 607a4d4b83ae5a89664c018fcfb150e588e9c0d33844f25ef5e4fa40ba4ce0b31a5eaf43ccdb67a10d463c3aca9ea746feb5c7a3a3942f855aea2f93bc6cc886
+SHA512 (linux-6.1.7.tar.xz) = a20e1c02b804aa367ca78a2c946c925ebd97b0f3394d1d68505772c20bd6df45c72bd68b59ba3ef9fe3dc4064107c42aaa9bfd6d0b87e6904114e21f146802c4
+SHA512 (kernel-abi-stablelists-6.1.7.tar.bz2) = 6f3107b91a36a81aa68fcb27816ccd4a71ffd17cbc9895d48c5101e1f8732cfbdd8cdbf69579c5cada3dda33fe93c0b2f1bd5b24f8ae15d1b10625a1ea2c0536
+SHA512 (kernel-kabi-dw-6.1.7.tar.bz2) = 003aecf4b780305b720d002c0250ab74c70f575c2abe57cf5a5648a73f5ff954e68ba6d486fda770a1ea9d3e97563fd8900b063d2957e947d60ec00ef39a2851