From 19efe144db6a6699f2695f93de5da7357aa96374 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 17 Aug 2022 09:42:06 -0500 Subject: [PATCH] kernel-5.19.2-300 * Wed Aug 17 2022 Justin M. Forbes [5.19.2-0] - v5.19.2 rebase Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 9 +++ kernel-aarch64-debug-fedora.config | 5 +- kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 5 +- kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 4 +- kernel-armv7hl-fedora.config | 4 +- kernel-armv7hl-lpae-debug-fedora.config | 4 +- kernel-armv7hl-lpae-fedora.config | 4 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 7 ++- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 7 ++- kernel-x86_64-rhel.config | 2 +- kernel.spec | 13 ++-- patch-5.19-redhat.patch | 79 +++++++++++++++++++++++-- sources | 6 +- 20 files changed, 124 insertions(+), 37 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 61fe44189..fe6cc02f4 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,12 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/3f1696ca1e6762e9774ecb4d0dedbc54dedb284d + 3f1696ca1e6762e9774ecb4d0dedbc54dedb284d drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7e71aedbf01514b3c8465e224532209c606c6a45 + 7e71aedbf01514b3c8465e224532209c606c6a45 Bluetooth: hci_event: Fix vendor (unknown) opcode status handling + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a8c6f414c43838287e9b59923debd432dbe4c4c8 + a8c6f414c43838287e9b59923debd432dbe4c4c8 Bluetooth: hci_sync: Fix resuming scan after suspend resume + "https://gitlab.com/cki-project/kernel-ark/-/commit"/4e3695b44c9dc069d2b3fbb530920e53094912fe 4e3695b44c9dc069d2b3fbb530920e53094912fe arm64: config: Enable DRM_V3D diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 82eaa055b..939c247bb 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -347,6 +347,7 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y CONFIG_ARM64_ERRATUM_1902691=y CONFIG_ARM64_ERRATUM_2038923=y # CONFIG_ARM64_ERRATUM_2051678 is not set @@ -1307,7 +1308,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2205,7 +2206,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 68deb9a3a..52fd2de9e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -282,6 +282,7 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y CONFIG_ARM64_ERRATUM_1902691=y CONFIG_ARM64_ERRATUM_2038923=y CONFIG_ARM64_ERRATUM_2051678=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b6117845e..78bf6ab2b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -347,6 +347,7 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y CONFIG_ARM64_ERRATUM_1902691=y CONFIG_ARM64_ERRATUM_2038923=y # CONFIG_ARM64_ERRATUM_2051678 is not set @@ -1307,7 +1308,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2189,7 +2190,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 14c7c94a5..233d502d1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -282,6 +282,7 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y CONFIG_ARM64_ERRATUM_1902691=y CONFIG_ARM64_ERRATUM_2038923=y CONFIG_ARM64_ERRATUM_2051678=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 38df5ced1..cb7c48dcd 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1298,7 +1298,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2235,7 +2235,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5f85c56e4..72653b2ec 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1298,7 +1298,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2220,7 +2220,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1920d300d..5293a2384 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1270,7 +1270,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2189,7 +2189,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index df4fe0118..7aa862549 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1270,7 +1270,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B_NEON=m CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -2174,7 +2174,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_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 55d35bdbf..0fbecc241 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1745,7 +1745,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 85b8561ad..cd6c1c26f 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1728,7 +1728,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e4d2343cd..05784ea03 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1754,7 +1754,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 480afa841..45598f3e7 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1737,7 +1737,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 8dc66ede7..2047d9d93 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1070,7 +1070,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_BLAKE2S=m -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m @@ -1909,7 +1909,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 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 @@ -1952,7 +1952,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 @@ -8009,6 +8009,7 @@ CONFIG_XEN_SCSI_FRONTEND=m CONFIG_XEN_SYMS=y CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_UNPOPULATED_ALLOC=y +CONFIG_XEN_VIRTIO_FORCE_GRANT=y CONFIG_XEN_VIRTIO=y CONFIG_XEN_WDT=m CONFIG_XEN=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 167006295..9d8b4ac7b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -878,7 +878,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e71a9a5f0..6c2f60640 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1069,7 +1069,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_BLAKE2S=m -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m @@ -1892,7 +1892,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 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 @@ -1935,7 +1935,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 @@ -7987,6 +7987,7 @@ CONFIG_XEN_SCSI_FRONTEND=m CONFIG_XEN_SYMS=y CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_UNPOPULATED_ALLOC=y +CONFIG_XEN_VIRTIO_FORCE_GRANT=y CONFIG_XEN_VIRTIO=y CONFIG_XEN_WDT=m CONFIG_XEN=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index b7fbde8d7..91703a188 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -878,7 +878,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m diff --git a/kernel.spec b/kernel.spec index 69bb953c3..56aa30ed2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,17 +122,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 5.19.1 +%define specversion 5.19.2 %define patchversion 5.19 %define pkgrelease 300 %define kversion 5 -%define tarfile_release 5.19.1 +%define tarfile_release 5.19.2 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.19.1 +%define kabiversion 5.19.2 # # End of genspec.sh variables @@ -3138,8 +3138,11 @@ fi # # %changelog -* Thu Aug 11 2022 Justin M. Forbes [5.19.1-300] -- v5.19.1 rebase +* Wed Aug 17 2022 Justin M. Forbes [5.19.2-300] +- v5.19.2 rebase + +* Wed Aug 17 2022 Justin M. Forbes [5.19.2-0] +- v5.19.2 rebase * Thu Aug 11 2022 Justin M. Forbes [5.19.1-0] - v5.19.1 rebase diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index c5eaaec65..01d7ac053 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -25,6 +25,7 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 ++- drivers/firmware/efi/secureboot.c | 38 + + drivers/firmware/sysfb.c | 18 +- drivers/gpu/drm/drm_ioctl.c | 8 +- drivers/gpu/drm/v3d/Kconfig | 5 +- drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- @@ -51,12 +52,13 @@ include/linux/security.h | 5 + init/Kconfig | 2 +- kernel/module/signing.c | 9 +- + net/bluetooth/hci_event.c | 20 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 58 files changed, 1690 insertions(+), 312 deletions(-) + 60 files changed, 1727 insertions(+), 313 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -248,7 +250,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 3acb329035eb..90437fb215a4 100644 +index e2edc38ce52c..87712692db3c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -367,10 +369,10 @@ index ce9826bce29b..948d18e59cf5 100644 CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 1652a9800ebe..834d178f6c70 100644 +index a5d1b561ed53..cd93c9041679 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1128,7 +1128,7 @@ endchoice +@@ -1145,7 +1145,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -379,7 +381,7 @@ index 1652a9800ebe..834d178f6c70 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1367,6 +1367,7 @@ config XEN +@@ -1384,6 +1384,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -866,6 +868,42 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 1f276f108cc9..7039ad9bdf7f 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -83,7 +99,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 51fcf1298023..7f1097947731 100644 --- a/drivers/gpu/drm/drm_ioctl.c @@ -3023,6 +3061,37 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 7cb956d3abb2..12df96177187 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -3997,6 +3997,26 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data, + break; + } + } ++ if (i == ARRAY_SIZE(hci_cc_table)) { ++ /* Unknown opcode, assume byte 0 contains the status, so ++ * that e.g. __hci_cmd_sync() properly returns errors ++ * for vendor specific commands send by HCI drivers. ++ * ++ * Note that the specification does not specify that ++ * byte 0 is the status: ++ * ++ * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E ++ * page 2189: ++ * ++ * Return_Parameters: ++ * Size: Depends on command ++ * ++ * For now using byte 0 seems to work fine, but in the future ++ * this may need to be updated so that drivers using vendor ++ * commands can specify their own completion handler. ++ */ ++ *status = skb->data[0]; ++ } + + handle_cmd_cnt_and_timer(hdev, ev->ncmd); + diff --git a/scripts/tags.sh b/scripts/tags.sh index 01fab3d4f90b..2ae5dfc904f9 100755 --- a/scripts/tags.sh diff --git a/sources b/sources index 650265f73..87c98f1ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.19.1.tar.xz) = 6842d9f6af4580c689e5b23027cedd632249387d4fcd44852b23398fea72de8846f2282ccde9a24a0c679f6d99a796c55188701bf9c76af3f732cd03600331a3 -SHA512 (kernel-abi-stablelists-5.19.1.tar.bz2) = 4e986ea6307b1b33979e2020d9730b5abd976364708fa08db7ed5d79dbbe731172bee213dabf1fa29e3e88ac57d44244a5fc710d0871cbf540b8ae95ee68472b -SHA512 (kernel-kabi-dw-5.19.1.tar.bz2) = bc4854d71a2a32bbd18e3b8ed7e61b11bfdd6c8f0eb825819a1d13dbebc3ca4fb7dd187916bdaf672e36de0c1c3ac60528d36156fdd4c002e8b23dc73c8527d8 +SHA512 (linux-5.19.2.tar.xz) = 9a8c156cb2845de53a822df2b93ad3b5cbbaab4acf1bdb8e509f04c0211ad37018c22cf8a361891671f30d57d591603a1d382ff3c27f55971ea9a9f2ef818eef +SHA512 (kernel-abi-stablelists-5.19.2.tar.bz2) = af4e3352327abcdea041e5a7a351bc051fee5de961591c4cf31b54f15e07a2aca0398c61cecb18fb46df34023cbc6b8943f36a121ad3b0484ed90be24bf8c58f +SHA512 (kernel-kabi-dw-5.19.2.tar.bz2) = 37c387fbdcf9068b3a82596d1fe29ae7ca4c89b6e4b600159eed118379f5ff66e52aceab77292efc57f31d79f1f825afc46b896ae8835af41f895d3fda3af531