From 570625a00905961401448b3fa3c784d2d2601a9e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 15 Apr 2024 21:51:20 +0000 Subject: [PATCH 1/3] linux (Generic): 6.6.28 MITIGATION_SPECTRE_BHI=y --- projects/Generic/linux/linux.x86_64.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 8b4b147fbbd..59fb2ec926a 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.26 Kernel Configuration +# Linux/x86 6.6.28 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -501,9 +501,7 @@ CONFIG_CPU_SRSO=y # CONFIG_SLS is not set # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y -# CONFIG_SPECTRE_BHI_ON is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_AUTO=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y # From 4f8afc74c9f78557ca543a25fb13706ec4061880 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 16 Apr 2024 13:13:26 +0000 Subject: [PATCH 2/3] linux (Rockchip): rebase patch for 6.6.27 --- .../patches/linux/default/linux-1000-drm-rockchip.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch index c4d56a87811..42cb86c3955 100644 --- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch @@ -1699,16 +1699,16 @@ index d1ae42757242..7b2cde230b87 100644 reg = <1>; remote-endpoint = <&edp_in_vopl>; @@ -1227,10 +1222,6 @@ hdmi_in_vopb: endpoint@0 { - reg = <0>; remote-endpoint = <&vopb_out_hdmi>; }; + - hdmi_in_vopl: endpoint@1 { - reg = <1>; - remote-endpoint = <&vopl_out_hdmi>; - }; }; }; - }; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 92c2207e686c..980b12cb0a49 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi From c0d53c5694f65b15e60e496f0cc09d5e350e851f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 15 Apr 2024 21:46:17 +0000 Subject: [PATCH 3/3] linux: update to 6.6.28 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d43518a7718..c2c9d2c83b1 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.6.26" - PKG_SHA256="af54b449f4fb93b8e8daa346144a7309e8e95174bd962c4b5917cf56120456d9" + PKG_VERSION="6.6.28" + PKG_SHA256="818716ed13e7dba6aaeae24e3073993e260812ed128d10272e94b922ee6d3394" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;;