From a6d04752878fb7b91731e31d4935a48b2aa16f4f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 7 Jan 2023 11:28:58 -0600 Subject: kernel-6.1.4-200 * Sat Jan 07 2023 Justin M. Forbes [6.1.4-0] - brcmfmac: Prefer DT board type over DMI board type (Ivan T. Ivanov) - Remove the revert patch from F36, as a new pahole is being pushed to stable making it unnecessary (Justin M. Forbes) - Linux v6.1.4 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 11 ++++++++--- patch-6.1-redhat.patch | 38 +++++++++++++++++++++++++++++++------- sources | 6 +++--- 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 668df2d86..64d2e4b92 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d4af335232ef0ad6d4036fa33a823cc1683d635c + d4af335232ef0ad6d4036fa33a823cc1683d635c brcmfmac: Prefer DT board type over DMI board type + "https://gitlab.com/cki-project/kernel-ark/-/commit"/c1862b27b603f8acf8ef8b64ae2f8650fd2ad267 c1862b27b603f8acf8ef8b64ae2f8650fd2ad267 disable enum64 BTF in fedora rawhide diff --git a/kernel.spec b/kernel.spec index 39c5162fb..103d38db3 100755 --- a/kernel.spec +++ b/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.3 +%define specversion 6.1.4 %define patchversion 6.1 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.1.3 +%define tarfile_release 6.1.4 # 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.3 +%define kabiversion 6.1.4 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3178,6 +3178,11 @@ fi # # %changelog +* Sat Jan 07 2023 Justin M. Forbes [6.1.4-0] +- brcmfmac: Prefer DT board type over DMI board type (Ivan T. Ivanov) +- Remove the revert patch from F36, as a new pahole is being pushed to stable making it unnecessary (Justin M. Forbes) +- Linux v6.1.4 + * Wed Jan 04 2023 Justin M. Forbes [6.1.3-0] - Linux v6.1.3 diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index 5c3b027e8..93ea12357 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -18,6 +18,7 @@ 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 ++-- @@ -33,10 +34,10 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 35 files changed, 452 insertions(+), 177 deletions(-) + 36 files changed, 455 insertions(+), 179 deletions(-) diff --git a/Makefile b/Makefile -index a69d14983a48..ddaa7fccb596 100644 +index 56afd1509c74..6dafad5a39a2 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -319,7 +320,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index d5ee52be176d..79e8fd5fbb06 100644 +index 5d403fb5bd92..385747b5361f 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -330,7 +331,7 @@ index d5ee52be176d..79e8fd5fbb06 100644 #include #define IPMI_DRIVER_VERSION "39.2" -@@ -5514,8 +5515,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5516,8 +5517,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; @@ -939,6 +940,29 @@ 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 @@ -1187,10 +1211,10 @@ index e137cf15aae9..2ed2341f7967 100755 # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope} # to force full paths for a non-O= build diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index b78753d27d8e..f0b37800431a 100644 +index d1fdd113450a..182e8090cfe8 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c -@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, return NULL; if (*status != EFI_BUFFER_TOO_SMALL) { @@ -1200,7 +1224,7 @@ index b78753d27d8e..f0b37800431a 100644 return NULL; } -@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -85,7 +86,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, *status = efi.get_variable(name, guid, NULL, &lsize, db); if (*status != EFI_SUCCESS) { kfree(db); diff --git a/sources b/sources index 329b9ee0f..a521c5496 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-6.1.3.tar.xz) = 0b910cb612e193d059739f8145f3ef0a24c3b9bd29532cd9b5b1eaab90fc387398e5fb3eca101a579f87c6350886f1d4bca60f31144804ab10b1612b67b40fdc -SHA512 (kernel-abi-stablelists-6.1.3.tar.bz2) = 4a99b5b4c494d8b58e3c2c7ae7fc617c9f8fe40427ca3203e17484eaef3c061da236aa1e08361a17abb9f9defa9b0814c1741b7fd8d8c027dcbde1be94b3ff2e -SHA512 (kernel-kabi-dw-6.1.3.tar.bz2) = cd99b00300b0957b913371e0172d382d13f729df8a54f2961a189aa5c599893895e477cbbbf39d7e1cb6e5ee8920e48dd827186828a4a00e65be84c663adc6ee +SHA512 (linux-6.1.4.tar.xz) = cd6cdb45267a8313c702091756f3bd083b521bea40c0606b60190710cc6b12688483808b1435fa7e9c74e1d0a5fe42ff3ff7413d9a9c8423b56896c6fadfc69f +SHA512 (kernel-abi-stablelists-6.1.4.tar.bz2) = 86bb0cb364a71cc126bbc059e6d2cd8529fe702d75dd5d9a8722fe748a5fa3e92bdc8acc2c1037607e4f4494e5439bf47f16f21a6a304d9f22ef7ff2280ec3f8 +SHA512 (kernel-kabi-dw-6.1.4.tar.bz2) = 36f5b8f547e032761014d19803328de2ca119f09882bb71ef9840147890157f1fe10a12645ac5ffd4e713b1417ab66d19b47fcbdfa2623e23559e8c10bb840e0 -- cgit