Skip to content

Tech/all/dt/hamoa rebase Linux 7.2-RC1#1436

Closed
LXQUALCOMM wants to merge 0 commit into
qualcomm-linux:tech/all/dt/hamoafrom
LXQUALCOMM:tech/all/dt/hamoa
Closed

Tech/all/dt/hamoa rebase Linux 7.2-RC1#1436
LXQUALCOMM wants to merge 0 commit into
qualcomm-linux:tech/all/dt/hamoafrom
LXQUALCOMM:tech/all/dt/hamoa

Conversation

@LXQUALCOMM

Copy link
Copy Markdown

No description provided.

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1436

PR: #1436
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28428980481

# Error File:Line PR-introduced? Root Cause
N/A Merge Conflicts (101 files) Multiple files Yes PR #1436 contains changes that conflict with the base branch tech/all/dt/hamoa during automerge integration

Verdict

Build failed before compilation — 101 merge conflicts prevent the build from starting. All conflicts are introduced by this PR's interaction with the base branch.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1436

PR: #1436
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28428980481

Issue Type: Merge Conflicts (Not Compilation Errors)

The build failed during the merge phase, not during compilation. The CI workflow attempts to merge PR #1436 (tech/all/dt/hamoa) into the baseline branch (qcom-next), but encountered 101 merge conflicts across multiple subsystems.

Subsystem Conflicting Files Examples
Device Tree Bindings 11 qcom,shikra-epss.yaml, qcom,prng.yaml, arm,smmu.yaml
Device Tree Sources 11 glymur.dtsi, kaanapali.dtsi, sm8750.dtsi, lemans.dtsi
Drivers (Multiple) 60+ hci_qca.c, pinctrl-*-lpass-lpi.c, iris/*, dp_*.c
Architecture Config 1 arch/arm64/configs/defconfig
Include Headers 4 include/linux/of.h, include/linux/pci.h, include/ufs/ufshcd.h
Sound Subsystem 3 audioreach.c, q6apm-dai.c, q6apm.c

Verdict

This is not a build error caused by the PR code. The PR cannot be built because it has extensive merge conflicts with the current qcom-next baseline. The PR needs to be rebased on the latest qcom-next to resolve these conflicts before the build can proceed.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1436 — validate-patch

PR: #1436

Verdict Issues Detailed Report
⚠️ 4 Full report

Final Summary

  1. Lore link present: No — this is an upstream merge from mainline Linux v7.1 → v7.2-rc1, not a mailing list patch series
  2. Lore link matches PR commits: N/A — no lore link to compare; this is a direct upstream integration
  3. Upstream patch status: Upstreamed — all changes are from official Linux v7.2-rc1 release
  4. PR present in qcom-next: Not checked — merge commits are typically not cherry-picked; they integrate entire upstream releases

Recommendation: The technical content is valid (official upstream v7.2-rc1), but the PR should include:

  • A proper commit message explaining the merge
  • Documentation of any merge conflicts and their resolution
  • Notes on Qualcomm-specific testing or integration concerns
  • Reference to the upstream v7.2-rc1 tag: https://git.kernel.org/torvalds/c/v7.2-rc1
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1436 - Merge Linux v7.2-rc1
Upstream commit: N/A (upstream merge from v7.1 to v7.2-rc1)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A This is an upstream merge, not a backport
Body preserves rationale N/A No commit message present in pr.patch
Fixes tag present/correct N/A Not applicable for merge commits
Authorship preserved N/A Merge commit, not a cherry-pick
Backport note (if applicable) N/A This is a forward merge, not a backport

Diff

File Status Notes
Makefile Version bump from 7.1 to 7.2-rc1
.mailmap Upstream mailmap updates
CREDITS Upstream credits updates
Documentation/* Extensive documentation updates
sound/soc/codecs/es9356.* New ES9356 codec driver added
~54,870 files total ⚠️ Cannot validate all files individually

Issues

  • No commit message: The pr.patch file contains only a raw diff without git format-patch metadata (no Subject, From, Date, or commit message body)
  • No lore link: This appears to be a direct upstream merge rather than a patch series from a mailing list
  • Massive scope: 5.8M lines across 54,870 files makes individual file validation impractical
  • Missing metadata: Cannot determine merge strategy, conflicts resolved, or integration notes

Verdict

This is a legitimate upstream kernel merge from v7.1 to v7.2-rc1, but the PR lacks proper commit message documentation explaining the merge rationale, any conflicts resolved, or Qualcomm-specific integration notes.

Final Summary

  1. Lore link present: No — this is an upstream merge from mainline Linux v7.1 → v7.2-rc1, not a mailing list patch series
  2. Lore link matches PR commits: N/A — no lore link to compare; this is a direct upstream integration
  3. Upstream patch status: Upstreamed — all changes are from official Linux v7.2-rc1 release
  4. PR present in qcom-next: Not checked — merge commits are typically not cherry-picked; they integrate entire upstream releases

Recommendation: The technical content is valid (official upstream v7.2-rc1), but the PR should include:

  • A proper commit message explaining the merge
  • Documentation of any merge conflicts and their resolution
  • Notes on Qualcomm-specific testing or integration concerns
  • Reference to the upstream v7.2-rc1 tag: https://git.kernel.org/torvalds/c/v7.2-rc1

@qlijarvis

Copy link
Copy Markdown

PR #1436 — checker-log-analyzer

PR: #1436
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28428980568

Checker Result Summary
Checker Result Summary
checkpatch Merge failed - unrelated histories
dt-binding-check Merge failed - unrelated histories
dtb-check Merge failed - unrelated histories
sparse-check Merge failed - unrelated histories
check-uapi-headers Merge failed - unrelated histories
check-patch-compliance Merge failed - unrelated histories
tag-check N/A Not executed (merge failed)
qcom-next-check N/A Not executed (merge failed)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1436 - Kernel version update (v7.1.0-rc1 → v7.2.0-rc1)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/28428980568

Checker Result Summary
checkpatch Merge failed - unrelated histories
dt-binding-check Merge failed - unrelated histories
dtb-check Merge failed - unrelated histories
sparse-check Merge failed - unrelated histories
check-uapi-headers Merge failed - unrelated histories
check-patch-compliance Merge failed - unrelated histories
tag-check N/A Not executed (merge failed)
qcom-next-check N/A Not executed (merge failed)

❌ All Checkers - Git Merge Failure

Root cause: PR #1436 contains a kernel version update from v7.1.0-rc1 to v7.2.0-rc1 (233,892 files changed, ~781MB patch) that has unrelated git history compared to the target integration branch.

Failure details:

2026-06-30T08:08:48.6890735Z fatal: refusing to merge unrelated histories
2026-06-30T08:08:48.7975621Z Merge failed or conflicts detected. Aborting merge.
2026-06-30T08:08:48.8014916Z ##[error]Process completed with exit code 3.

The checker workflow attempted to:

  1. Create integration branch based on baseline commit 19b282f417584cfe14ce6a262122c51553d026ec
  2. Merge topic branch tech/all/dt/hamoa
  3. Merge PR Tech/all/dt/hamoa rebase Linux 7.2-RC1 #1436 into the integration branch

Git refused the merge because PR #1436's commit history does not share a common ancestor with the target branch. This is expected behavior when attempting to merge a completely new kernel tree or a rebased branch that rewrote history.

Fix: This PR requires one of the following approaches:

  1. Allow unrelated histories (recommended for kernel version updates):

    git merge pr-1436 --allow-unrelated-histories

    Then resolve any merge conflicts that arise.

  2. Rebase the PR onto the target branch:

    git checkout pr-1436
    git rebase tech/all/dt/hamoa

    This will replay all commits from PR Tech/all/dt/hamoa rebase Linux 7.2-RC1 #1436 on top of the target branch. Given the massive size (233K files), this may not be practical.

  3. Create a new branch from the PR and cherry-pick specific commits:
    If only specific changes are needed rather than the full kernel update.

  4. Update the CI workflow to handle kernel version updates:
    Modify the checker workflow to detect major version updates and automatically use --allow-unrelated-histories flag.

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git checkout tech/all/dt/hamoa
git fetch origin pull/1436/head:pr-1436
git merge pr-1436  # Will fail with "refusing to merge unrelated histories"

Additional context:

  • This is not a code quality issue - no checkers could run because the merge failed before any analysis
  • The PR modifies 233,892 files across the entire kernel tree
  • This appears to be a major kernel version bump (v7.1 → v7.2)
  • The patch size (781MB, ~20M lines) suggests this is a full kernel tree update

Verdict

BLOCKER: Cannot merge due to unrelated git histories. This PR requires manual intervention to either:

  • Use --allow-unrelated-histories flag during merge
  • Restructure the PR to share common history with the target branch
  • Update the CI workflow to handle major kernel version updates

The checkers themselves did not identify any code quality issues because they could not execute. Once the merge strategy is resolved, all checkers should be re-run to validate the actual code changes.

@LXQUALCOMM LXQUALCOMM closed this Jul 1, 2026
@LXQUALCOMM LXQUALCOMM force-pushed the tech/all/dt/hamoa branch from 006a502 to 1bba27c Compare July 1, 2026 06:02
@qcomlnxci qcomlnxci requested a review from a team July 1, 2026 06:04
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1436

PR: #1436
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28497157044

# Error File:Line PR-introduced? Root Cause
1 Merge conflict (add/add) Documentation/devicetree/bindings/cpufreq/qcom,shikra-epss.yaml Yes Both branches created the same file with different content
2 Merge conflict (content) Documentation/devicetree/bindings/crypto/qcom,prng.yaml Yes Conflicting changes to the same file sections
3 Merge conflict (content) Documentation/devicetree/bindings/crypto/qcom-qce.yaml Yes Conflicting changes to the same file sections
4 Merge conflict (content) Multiple DT bindings, drivers, and source files Yes 100+ files with merge conflicts across the tree

Verdict

This is not a compilation error. The build failed during the pre-merge integration phase when attempting to merge PR branch tech/all/dt/hamoa with the baseline qcom-next branch. The automerge tool encountered 100+ merge conflicts and could not proceed automatically. All conflicts are integration issues between the PR branch and the baseline, requiring manual resolution.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1436

PR: #1436
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28497157044

# Error File:Line PR-introduced? Root Cause
N/A Merge Conflict (not compilation error) Multiple files (101 conflicts) Cannot determine Build failed during automerge/integration phase before compilation started

Verdict

This is not a compilation failure. The build failed during the pre-build merge/integration phase when the automerge tool (ci-merge) attempted to merge the PR branch (tech/all/dt/hamoa) with the baseline. The process encountered 101 merge conflicts across device tree bindings, drivers, and configuration files. No compilation was attempted because the merge could not complete automatically. The PR patch file is empty (0 bytes), suggesting either the PR has no changes or the patch extraction failed.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1436 — validate-patch

PR: #1436

Verdict Issues Detailed Report
1 Full report

Final Summary

  1. Lore link present: N/A — no commits in PR to check for lore links
  2. Lore link matches PR commits: N/A — no commits to compare
  3. Upstream patch status: N/A — no patches present
  4. PR present in qcom-next: Not checked — no commits to search for

Recommendation: Close this PR or ask the author to push commits. A PR with no commits cannot be merged or validated.

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1436
Base Branch: tech/all/dt/hamoa
Commit SHA: 1bba27c
Upstream commit: N/A
Verdict: ❌ FAIL

Critical Issue

PR #1436 contains no commits or patches to validate.

The GitHub Actions CI workflow attempted to fetch and merge PR #1436 but encountered a fatal error:

fatal: refusing to merge unrelated histories
Merge failed or conflicts detected. Aborting merge.

This error indicates one of the following scenarios:

  1. The PR branch is empty (contains no commits)
  2. The PR branch has been deleted
  3. The PR branch has no common ancestor with the base branch tech/all/dt/hamoa

Analysis

  • pr.patch file: Empty (0 bytes) — no patch content available for validation
  • CI merge attempt: Failed with "unrelated histories" error
  • Commit extraction: Unable to extract any commit messages or diffs
  • Lore link check: Cannot be performed — no commits to analyze

Issues

  • No commits found: The PR appears to contain no commits. This could mean:
    • The PR was created but no commits were pushed
    • The PR branch was force-pushed or deleted after CI started
    • The PR is targeting an incompatible base branch with no shared history

Verdict

Cannot validate — PR contains no commits. This PR should be closed or the author should push commits to the PR branch before it can be reviewed.

Final Summary

  1. Lore link present: N/A — no commits in PR to check for lore links
  2. Lore link matches PR commits: N/A — no commits to compare
  3. Upstream patch status: N/A — no patches present
  4. PR present in qcom-next: Not checked — no commits to search for

Recommendation: Close this PR or ask the author to push commits. A PR with no commits cannot be merged or validated.

@qlijarvis

Copy link
Copy Markdown

PR #1436 — checker-log-analyzer

PR: #1436
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/28497157313

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - sync failed
dt-binding-check ⏭️ Skipped - sync failed
dtb-check ⏭️ Skipped - sync failed
sparse-check ⏭️ Skipped - sync failed
check-uapi-headers ⏭️ Skipped - sync failed
check-patch-compliance ⏭️ Skipped - sync failed
tag-check N/A Not executed
qcom-next-check N/A Not executed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1436 (tech/all/dt/hamoa)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/28497157313

Checker Result Summary
checkpatch ⏭️ Skipped - sync failed
dt-binding-check ⏭️ Skipped - sync failed
dtb-check ⏭️ Skipped - sync failed
sparse-check ⏭️ Skipped - sync failed
check-uapi-headers ⏭️ Skipped - sync failed
check-patch-compliance ⏭️ Skipped - sync failed
tag-check N/A Not executed
qcom-next-check N/A Not executed

❌ Infrastructure Failure: Unrelated Histories

Root cause: Git merge failed with "fatal: refusing to merge unrelated histories" during the sync phase, preventing all checkers from running.

Failure details:

2026-07-01T06:20:52.2426581Z  ** Merging topic branch: topic/tech/all/dt/hamoa
2026-07-01T06:21:10.6930837Z fatal: refusing to merge unrelated histories
2026-07-01T06:21:10.7990777Z Merge failed, manual merge
...
2026-07-01T06:21:11.5357853Z Merging pr-1436 (no-commit)...
2026-07-01T06:21:31.9441621Z fatal: refusing to merge unrelated histories
2026-07-01T06:21:32.0573617Z Merge failed or conflicts detected. Aborting merge.
2026-07-01T06:21:32.0609871Z ##[error]Process completed with exit code 3.

Analysis:

  • The PR patch file is empty (0 bytes), indicating the PR may have no commits or the patch extraction failed
  • The base branch tech/all/dt/hamoa has a completely unrelated Git history from the integration baseline (tag 19b282f417584cfe14ce6a262122c51553d026ec)
  • Git refuses to merge branches with no common ancestor without the --allow-unrelated-histories flag
  • This is a workflow/infrastructure issue, not a code quality issue

Fix:

  1. Verify PR has commits: Check that PR Tech/all/dt/hamoa rebase Linux 7.2-RC1 #1436 actually contains commits. If empty, close or add commits.

  2. Fix branch history: The tech/all/dt/hamoa branch needs to share common history with the integration baseline. Options:

    • Rebase tech/all/dt/hamoa onto a common ancestor with the baseline
    • Use git merge --allow-unrelated-histories if this is intentional (e.g., importing external tree)
    • Verify the correct base branch is configured for this PR
  3. Update checker workflow: If unrelated histories are expected for this topic branch, the checker sync script needs to be updated to handle this case with --allow-unrelated-histories.

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git fetch origin tech/all/dt/hamoa
git checkout -b integ <baseline-tag>
git merge origin/tech/all/dt/hamoa  # Will fail with "refusing to merge unrelated histories"

Verdict

Infrastructure blocker: PR cannot be checked due to unrelated Git histories between the base branch and integration baseline. The branch history must be fixed before checkers can run. No code quality assessment is possible until the sync phase succeeds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants