uefi: all: edge: bump to 6.7-rc7; arm64: fix Phytium stmmac patch (by Igor)

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
This commit is contained in:
Ricardo Pardini
2023-12-27 01:48:43 +01:00
committed by Igor
parent 7258246bfd
commit 9cb365aad2
2 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -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