From 9cb365aad24a25dcf17c4d81f1a6f29a529764b6 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 27 Dec 2023 01:48:43 +0100 Subject: [PATCH] uefi: all: edge: bump to 6.7-rc7; arm64: fix Phytium stmmac patch (by Igor) Co-authored-by: Igor Pecovnik --- config/sources/families/include/uefi_common.inc | 4 ++-- .../archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc index 111cbd88a9..5fc2d8051c 100644 --- a/config/sources/families/include/uefi_common.inc +++ b/config/sources/families/include/uefi_common.inc @@ -33,8 +33,8 @@ case "${BRANCH}" in ;; edge) - declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. - declare -g KERNELBRANCH='branch:linux-6.6.y' + declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel. + declare -g KERNELBRANCH='tag:v6.7-rc7' # @TODO: branch:linux-6.7.y' when released ;; esac diff --git a/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch b/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch index b77006b695..3f1f76bc48 100644 --- a/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch +++ b/patch/kernel/archive/uefi-arm64-6.7/driver-phytium-stmmac-acpi.patch @@ -646,9 +646,9 @@ index c5565b2a70ac..783d23487612 100644 devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac); +struct plat_stmmacenet_data * +stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac); - void stmmac_remove_config_dt(struct platform_device *pdev, - struct plat_stmmacenet_data *plat); + int stmmac_get_platform_resources(struct platform_device *pdev, + struct stmmac_resources *stmmac_res); diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 37fb033e1c29..bf6ba5e81a95 100644 --- a/drivers/net/phy/at803x.c