Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux: update to 6.6.28 #8811

Merged
merged 3 commits into from
Apr 17, 2024
Merged

linux: update to 6.6.28 #8811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
570625a
linux (Generic): 6.6.28 MITIGATION_SPECTRE_BHI=y
heitbaum Apr 15, 2024
4f8afc7
linux (Rockchip): rebase patch for 6.6.27
heitbaum Apr 16, 2024
c0d53c5
linux: update to 6.6.28
heitbaum Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/linux/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
6 changes: 2 additions & 4 deletions projects/Generic/linux/linux.x86_64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

#
Expand Down
4 changes: 2 additions & 2 deletions projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down