PR: qualcomm-linux/kernel-topics#2176 Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/42175817102
PR: qualcomm-linux/kernel-topics#2176 Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/42175817102
| # | Error | File:Line | PR-introduced? | Root Cause |
|---|---|---|---|---|
| 1 | Git merge conflict during automerge | arch/arm64/boot/dts/qcom/Makefile |
Yes | PR adds nord-camx-el2 dtb entries that conflict with existing Makefile changes from other integrated topic branches |
| 2 | Missing git remote reference | tech/overlay/dt | No | Pre-existing infrastructure issue - the tech/overlay/dt branch does not exist in the remote repository |
This is not a compilation failure. The build failed during the automerge (integration) phase due to a merge conflict in the Makefile introduced by this PR. The PR modifies arch/arm64/boot/dts/qcom/Makefile to add nord-camx-el2 device tree entries, which conflicts with changes already present in the qcom-next integration branch.
PR: qualcomm-linux/kernel-topics#2176 Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/42175817102
Location: arch/arm64/boot/dts/qcom/Makefile
Error message:
2026-11-06T06:49:11.6949271Z Merge failed, manual merge
2026-11-06T06:49:11.7217026Z tortoisemerge emerge vimdiff nvimdiff
2026-11-06T06:49:11.8978901Z Merging:
2026-11-06T06:49:11.8988370Z arch/arm64/boot/dts/qcom/Makefile
PR-introduced: Yes
Reason: The PR adds new device tree build rules for nord-camx-el2 configurations in the Makefile:
nord-ride-embedded-camx-el2-dtbsand related entriesnord-rrd-camx-el2-dtbsand related entriesnord-camx-el2.dtboentry
These additions conflict with changes already present in the qcom-next integration branch from previously merged topic branches (tech/all/dt/qcs6490, tech/all/hawi, tech/all/shikra, etc.). The automerge process recorded "preimages" for the Makefile, indicating it detected conflicts that could not be automatically resolved.
Fix: Rebase the PR branch on the latest qcom-next integration branch to resolve the Makefile conflicts, ensuring the new nord-camx-el2 entries are properly integrated with existing device tree build rules.
Location: Git remote fetch
Error message:
2026-11-06T06:47:25.3434867Z fatal: couldn't find remote ref refs/heads/tech/overlay/dt
2026-11-06T06:47:25.3446961Z error: Could not fetch tech/overlay/dt
PR-introduced: No
Reason: This is a pre-existing infrastructure issue. The automerge configuration references a tech/overlay/dt branch that does not exist in the remote repository (https://github.com/qualcomm-linux-stg/kernel-topics.git). This error occurred before the PR commit was merged and is unrelated to the PR changes. The automerge process continued despite this error.
Fix: Not applicable to this PR - this is an infrastructure configuration issue that should be addressed separately.
The PR introduces a merge conflict in arch/arm64/boot/dts/qcom/Makefile by adding new device tree overlay build rules for nord-camx-el2 configurations. The conflict arises because the Makefile has been modified by multiple topic branches that were already integrated into qcom-next before this PR was merged. The automerge process cannot automatically resolve the conflict because the PR's changes overlap with or are adjacent to existing modifications in the same section of the Makefile.
- Fetch the latest qcom-next integration branch from the kernel-config repository
- Rebase the PR branch (tech/overlay/dt or the branch containing commit 40efbe7fb4ec) onto the latest qcom-next
- Manually resolve the Makefile conflicts by ensuring the nord-camx-el2 entries are properly placed relative to existing nord device tree rules
- Verify the resolved Makefile maintains correct syntax and ordering
- Force-push the rebased branch and re-trigger the CI build
Perfect! Now I understand the issue. The PR is trying to override the tech/overlay/dt topic branch with commit 7f719520897f8084ce6eab5a81f2c734abb20587, but this commit is causing merge conflicts with the arch/arm64/boot/dts/qcom/Makefile file when being merged into the integration branch.
The key issue is that the PR modifies the Makefile in a way that conflicts with changes already present in the integration branch from other topic branches. This is NOT a compilation error - it's a merge conflict during the automerge process.
Let me now create the analysis report:
[BUILD_SUMMARY]
PR: qualcomm-linux/kernel-topics#2176 Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/42175817102
| # | Error | File:Line | PR-introduced? | Root Cause |
|---|---|---|---|---|
| 1 | Git merge conflict during automerge | arch/arm64/boot/dts/qcom/Makefile |
Yes | PR adds nord-camx-el2 dtb entries that conflict with existing Makefile changes from other integrated topic branches |
| 2 | Missing git remote reference | tech/overlay/dt | No | Pre-existing infrastructure issue - the tech/overlay/dt branch does not exist in the remote repository |
This is not a compilation failure. The build failed during the automerge (integration) phase due to a merge conflict in the Makefile introduced by this PR. The PR modifies arch/arm64/boot/dts/qcom/Makefile to add nord-camx-el2 device tree entries, which conflicts with changes already present in the qcom-next integration branch.
[/BUILD_SUMMARY]
[BUILD_DETAILED]
PR: qualcomm-linux/kernel-topics#2176 Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/42175817102
Location: arch/arm64/boot/dts/qcom/Makefile
Error message:
2026-11-06T06:49:11.6949271Z Merge failed, manual merge
2026-11-06T06:49:11.7217026Z tortoisemerge emerge vimdiff nvimdiff
2026-11-06T06:49:11.8978901Z Merging:
2026-11-06T06:49:11.8988370Z arch/arm64/boot/dts/qcom/Makefile
PR-introduced: Yes
Reason: The PR adds new device tree build rules for nord-camx-el2 configurations in the Makefile:
nord-ride-embedded-camx-el2-dtbsand related entriesnord-rrd-camx-el2-dtbsand related entriesnord-camx-el2.dtboentry
These additions conflict with changes already present in the qcom-next integration branch from previously merged topic branches (tech/all/dt/qcs6490, tech/all/hawi, tech/all/shikra, etc.). The automerge process recorded "preimages" for the Makefile, indicating it detected conflicts that could not be automatically resolved.
Fix: Rebase the PR branch on the latest qcom-next integration branch to resolve the Makefile conflicts, ensuring the new nord-camx-el2 entries are properly integrated with existing device tree build rules.
Location: Git remote fetch
Error message:
2026-11-06T06:47:25.3434867Z fatal: couldn't find remote ref refs/heads/tech/overlay/dt
2026-11-06T06:47:25.3446961Z error: Could not fetch tech/overlay/dt
PR-introduced: No
Reason: This is a pre-existing infrastructure issue. The automerge configuration references a tech/overlay/dt branch that does not exist in the remote repository (https://github.com/qualcomm-linux-stg/kernel-topics.git). This error occurred before the PR commit was merged and is unrelated to the PR changes. The automerge process continued despite this error.
Fix: Not applicable to this PR - this is an infrastructure configuration issue that should be addressed separately.
The PR introduces a merge conflict in arch/arm64/boot/dts/qcom/Makefile by adding new device tree overlay build rules for nord-camx-el2 configurations. The conflict arises because the Makefile has been modified by multiple topic branches that were already integrated into qcom-next before this PR was merged. The automerge process cannot automatically resolve the conflict because the PR's changes overlap with or are adjacent to existing modifications in the same section of the Makefile.
- Fetch the latest qcom-next integration branch from the kernel-config repository
- Rebase the PR branch (tech/overlay/dt or the branch containing commit 40efbe7fb4ec) onto the latest qcom-next
- Manually resolve the Makefile conflicts by ensuring the nord-camx-el2 entries are properly placed relative to existing nord device tree rules
- Verify the resolved Makefile maintains correct syntax and ordering
- Force-push the rebased branch and re-trigger the CI build [/BUILD_DETAILED]