kernel-6.1.7-200
* Wed Jan 18 2023 Augusto Caringi <acaringi@redhat.com> [6.1.7-0] - enable efifb for Nvidia (Justin M. Forbes) - Linux v6.1.7 Resolves: Signed-off-by: Augusto Caringi <acaringi@redhat.com>
This commit is contained in:
parent
ebd0a3b022
commit
e32aba66db
15 changed files with 30 additions and 50 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
10
kernel.spec
10
kernel.spec
|
|
@ -124,17 +124,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 200
|
||||
%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 200%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.1.6
|
||||
%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
|
||||
|
|
@ -3178,6 +3178,10 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 19e8c6dec6e5..37b6bc722a3e 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
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-6.1.6.tar.xz) = d57d0a1094dddf90d2837a968339918701010bffa49d0bd4b0b9a3d1d443595e0c65ca2920028dac8374c85ca8ebbb60c89032136b2e3bb8aa8ee7f237368cb8
|
||||
SHA512 (kernel-abi-stablelists-6.1.6.tar.bz2) = e3c2c969ef94b444ab798de43d64322e2b5610c0731743914bba1cc7b993da9368a99d551870a8909e7ea8ae3401874a26330b31f5c20e1a433b8ce3965437a5
|
||||
SHA512 (kernel-kabi-dw-6.1.6.tar.bz2) = da0da940da6f08374a8c7a9b51a48b5d45279b0d5a04d2abc9072798f653f4ecd6e887b99b96e073741e075bb61fa2e2e6cb291a028ac464b3795e5801317c0e
|
||||
SHA512 (linux-6.1.7.tar.xz) = a20e1c02b804aa367ca78a2c946c925ebd97b0f3394d1d68505772c20bd6df45c72bd68b59ba3ef9fe3dc4064107c42aaa9bfd6d0b87e6904114e21f146802c4
|
||||
SHA512 (kernel-abi-stablelists-6.1.7.tar.bz2) = 93e3e8b3d7c76884cc938a5f4a70039a3ee19e0c1fe7ab00f875c4ee9a683d1128576b43f165f3f274fad8e4cf03c7f4f338854d88e109fb888d99b6ff80699d
|
||||
SHA512 (kernel-kabi-dw-6.1.7.tar.bz2) = 003aecf4b780305b720d002c0250ab74c70f575c2abe57cf5a5648a73f5ff954e68ba6d486fda770a1ea9d3e97563fd8900b063d2957e947d60ec00ef39a2851
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue