+ Vincenzo
On 22/03/2023 11:29, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
New conflicts have appeared now in the kernel git.
That's quite misleading, there can only be conflicts between two branches. Conflicts appear when trying to merge master, now that it's rebased on 6.1, and clearly you don't want to merge in that case.
Also for next time, would be good to make it clear (in the tag presumably) that this is not a kernel patch, it is for morello-pcuabi-env [1].
Kevin
[1] https://git.morello-project.org/morello/morello-pcuabi-env
Use checkout not merge to solve this so we can build morello images again.
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com
morello/scripts/configure-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/morello/scripts/configure-linux.sh b/morello/scripts/configure-linux.sh index 54933fc..b7dd2b4 100755 --- a/morello/scripts/configure-linux.sh +++ b/morello/scripts/configure-linux.sh @@ -10,7 +10,7 @@ submodule_update() { echo "$1 updating progress..." # Populate repositories git submodule update --init --recursive --progress $1
- git submodule update --remote --merge $1
- git submodule update --remote --checkout $1
} submodule_update_projects() {