From: Carsten Haitzler carsten.haitzler@arm.com
New conflicts have appeared now in the kernel git. 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() {
+ 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() {
On 3/22/23 10:37, Kevin Brodsky wrote:
- 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.
conflicts appear during a very long log while merging in the kernel tree - either way a lot of conflict lines deep down in the log (well far back up a very long log that the first time scrolled well off my back-scroll history so it took a bit to track the original source). i was being rather brief. the diff should be clear on this. :)
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].
at least in this case i would assume the patch diff makes that obvious given the small amount of traffic for this alternate git - we don't have a workflow for patches for this repo, so i sent them here as it's all we have that is kind of appropriate.
perhaps we should use a proper gitlab workflow with MR's etc. ...
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() {
Hi Carsten,
On 3/27/23 16:43, Carsten Haitzler wrote:
On 3/22/23 10:37, Kevin Brodsky wrote:
- 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.
conflicts appear during a very long log while merging in the kernel tree - either way a lot of conflict lines deep down in the log (well far back up a very long log that the first time scrolled well off my back-scroll history so it took a bit to track the original source). i was being rather brief. the diff should be clear on this. :)
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].
at least in this case i would assume the patch diff makes that obvious given the small amount of traffic for this alternate git - we don't have a workflow for patches for this repo, so i sent them here as it's all we have that is kind of appropriate.
perhaps we should use a proper gitlab workflow with MR's etc. ...
The workflow is the same as the kernel, and follows the same logic of Continuous Integration so no MRs or similar, with the difference that this is userspace/distro related work, so you should post the changes to linux-morello-distro as described in [1].
For what concerns the changes: - Fork the main morello-linux-docker repo on gitlab in your private workspace (you should inherit CI) - Post a link to the CI pipeline you run. For your reference [2]. - For multiple changes please add a cover letter.
[1] https://git.morello-project.org/morello/kernel/linux/-/wikis/res/Linux_on_Mo... (Slide 8) [2] https://git.morello-project.org/morello/morello-linux-docker/-/pipelines/114...
Hope this helps to clarify.
Thanks, Vincenzo
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() {
On 3/28/23 12:02, Vincenzo Frascino wrote:
Hi Carsten,
On 3/27/23 16:43, Carsten Haitzler wrote:
On 3/22/23 10:37, Kevin Brodsky wrote:
- 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.
conflicts appear during a very long log while merging in the kernel tree - either way a lot of conflict lines deep down in the log (well far back up a very long log that the first time scrolled well off my back-scroll history so it took a bit to track the original source). i was being rather brief. the diff should be clear on this. :)
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].
at least in this case i would assume the patch diff makes that obvious given the small amount of traffic for this alternate git - we don't have a workflow for patches for this repo, so i sent them here as it's all we have that is kind of appropriate.
perhaps we should use a proper gitlab workflow with MR's etc. ...
The workflow is the same as the kernel, and follows the same logic of Continuous
Can I just say that we have all this gitlab infra that does all of this at the click of a button. You don't have to remember to format patch with cover letters and edit them and create a new script for a new git sent email with all the magic options to yet a new email address when gitlab already does all of that.
Gitlab offers everything needed in one place with far lower friction allowing to bring new people up to speed with less effort as all they have to do is google "how to submit patches via gitlab" and have all of that already documented in detail with no extra effort like telling me these patches have to go via the morello distros mailing list.
Now one should have to read a slide deck on contributing. They should just go "Ooh gitlab. This works like all other gitlabs" and that's it.
Integration so no MRs or similar, with the difference that this is
Now the CI is un-broken I can send the patches...
userspace/distro related work, so you should post the changes to linux-morello-distro as described in [1].
For what concerns the changes:
- Fork the main morello-linux-docker repo on gitlab in your private workspace
(you should inherit CI)
- Post a link to the CI pipeline you run. For your reference [2].
- For multiple changes please add a cover letter.
[1] https://git.morello-project.org/morello/kernel/linux/-/wikis/res/Linux_on_Mo... (Slide 8) [2] https://git.morello-project.org/morello/morello-linux-docker/-/pipelines/114...
Hope this helps to clarify.
Thanks, Vincenzo
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() {
linux-morello@op-lists.linaro.org
-
Carsten Haitzler -
carsten.haitzler＠foss.arm.com
-
Kevin Brodsky -
Vincenzo Frascino