diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index 22b27d774..599f97386 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -47,7 +47,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. For mainline caching. #KERNELBRANCH='branch:linux-6.6.y' - KERNELBRANCH='tag:v6.6-rc6' + KERNELBRANCH='tag:v6.6-rc7' KERNELPATCHDIR='meson64-edge' ;; diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 287f0924d..c6a38b2dc 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -155,7 +155,7 @@ case $BRANCH in KERNELPATCHDIR='rockchip64-'$BRANCH declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. #KERNELBRANCH="branch:linux-6.6.y" - KERNELBRANCH='tag:v6.6-rc6' + KERNELBRANCH='tag:v6.6-rc7' LINUXFAMILY=rockchip64 LINUXCONFIG='linux-rockchip64-'$BRANCH diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc index 509ee247a..644fc1673 100644 --- a/config/sources/families/include/uefi_common.inc +++ b/config/sources/families/include/uefi_common.inc @@ -42,7 +42,7 @@ case "${BRANCH}" in declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}" declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. #declare -g KERNELBRANCH='branch:linux-6.6.y' - declare -g KERNELBRANCH='tag:v6.6-rc6' + declare -g KERNELBRANCH='tag:v6.6-rc7' declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty. ;; esac diff --git a/config/sources/families/rk3568-odroid.conf b/config/sources/families/rk3568-odroid.conf index 0e5c0d948..629729bd1 100644 --- a/config/sources/families/rk3568-odroid.conf +++ b/config/sources/families/rk3568-odroid.conf @@ -18,7 +18,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel (for armbian-next) #declare -g KERNELBRANCH='branch:linux-6.6.y' - KERNELBRANCH='tag:v6.6-rc6' + KERNELBRANCH='tag:v6.6-rc7' KERNELPATCHDIR='archive/rk3568-odroid-6.6' # @TODO fix # patches for overlays et al ;; diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch index fe2c863fd..d398d73ac 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch @@ -11,7 +11,7 @@ Odroid C2 enable SPI 1 file changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index c6a38d890db5..09b6b2bea02b 100644 +index c6a38d890db5..73ad65fad0d7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -176,6 +176,32 @@ hdmi_connector_in: endpoint { diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch index 0a0354f98..816f08282 100644 --- a/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch @@ -9,7 +9,7 @@ Enable odroidc2-dev DVFS (#763) 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index 09b6b2bea02b..b4862f5f6347 100644 +index 73ad65fad0d7..f99f8414d8e0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -360,7 +360,8 @@ &saradc { diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch index 6b74fe0ca..4f2ab4c12 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch @@ -1,15 +1,15 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 24 Oct 2023 08:17:17 -0400 -Subject: [PATCH] arm64: dts: Radxa Zero: set aliases for serial, i2c and spi +Subject: arm64: dts: Radxa Zero: set aliases for serial, i2c and spi Signed-off-by: Patrick Yavitz --- - .../arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 12 ++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 12 ++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index cf0a9be83fc4..384f39afeba8 100644 +index fcd7e1d8e16f..2e4646e255ad 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -15,6 +15,18 @@ / { diff --git a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch index 2d0d728d9..2f9afba7c 100644 --- a/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch +++ b/patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch @@ -19,7 +19,7 @@ Suggested-by: Neil Armstrong Signed-off-by: Christian Hewitt Signed-off-by: Yuntian Zhang --- - .../dts/amlogic/meson-g12a-radxa-zero.dts | 48 +++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 48 ++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts diff --git a/patch/kernel/archive/rk3568-odroid-6.6/5001-montjoie-crypto-rk35xx.patch b/patch/kernel/archive/rk3568-odroid-6.6/5001-montjoie-crypto-rk35xx.patch index 559ee4abd..84a7e7b88 100644 --- a/patch/kernel/archive/rk3568-odroid-6.6/5001-montjoie-crypto-rk35xx.patch +++ b/patch/kernel/archive/rk3568-odroid-6.6/5001-montjoie-crypto-rk35xx.patch @@ -97,35 +97,6 @@ index 000000000000..fbe1e1b33dab -- Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Corentin Labbe -Date: Mon, 26 Sep 2022 13:38:25 +0200 -Subject: MAINTAINERS: add new dt-binding doc to the right entry - -Rockchip crypto driver have a new file to be added. - -Signed-off-by: Corentin Labbe ---- - MAINTAINERS | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/MAINTAINERS b/MAINTAINERS -index 208cfcc1aee3..03e47802653a 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -18617,6 +18617,7 @@ M: Corentin Labbe - L: linux-crypto@vger.kernel.org - S: Maintained - F: Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml -+F: Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml - F: drivers/crypto/rockchip/ - - ROCKCHIP I2S TDM DRIVER --- -Armbian - - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Wed, 20 Sep 2023 16:04:18 +0200 @@ -165,7 +136,6 @@ index 5544f66c6ff4..ffffe084a966 100644 -- Armbian - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Thu, 22 Sep 2022 19:38:13 +0200 @@ -206,7 +176,6 @@ index abee88911982..b9cbab2246e2 100644 -- Armbian - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Wed, 20 Sep 2023 16:06:43 +0200 @@ -365,7 +334,6 @@ index d4264db2a07f..c0d08ae78cd5 100644 -- Armbian - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Wed, 20 Sep 2023 15:53:17 +0200 @@ -2381,7 +2349,6 @@ index 000000000000..9b6cc29847d7 -- Armbian - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Wed, 4 Oct 2023 12:24:35 +0200