[AUTO-CHERRYPICK] [AutoPR- Security] Patch edk2 for CVE-2026-75803, CVE-2026-63076, CVE-2026-63074, CVE-2026-63072 [HIGH] - branch 3.0-dev - #18725
Merged
Conversation
…-2026-63074, CVE-2026-63072 [HIGH] (#18638) Co-authored-by: Aditya Singh <v-aditysing@microsoft.com> (cherry picked from commit fc2ef58)
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
…-signed/edk2-hvloader-signed.spec
Author
|
All conflicts resolved. |
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | %{GITDATE}git%{GITCOMMIT} | %{GITDATE}git%{GITCOMMIT} | %{GITDATE}git%{GITCOMMIT} |
| Release | 19 | 19 | 19 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release %{GITDATE}git%{GITCOMMIT}-19 is not higher than Source %{GITDATE}git%{GITCOMMIT}-19
- Version-release %{GITDATE}git%{GITCOMMIT}-19 is not higher than Target %{GITDATE}git%{GITCOMMIT}-19
- Duplicate changelog entry for 20240524git3e722403cd16-15 (appears 2 times)
- Duplicate changelog entry for 20240524git3e722403cd16-14 (appears 2 times)
- Changelog out of order: 20240524git3e722403cd16-14 appears before 20240524git3e722403cd16-17
edk2 SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | %{GITDATE}git%{GITCOMMIT} | %{GITDATE}git%{GITCOMMIT} | %{GITDATE}git%{GITCOMMIT} |
| Release | 19 | 19 | 20 |
| Patches | 52 | 49 | 53 |
| Conflict | Yes |
- Duplicate changelog entry for 20240524git3e722403cd16-10 (appears 2 times)
- Duplicate changelog entry for 20240524git3e722403cd16-9 (appears 2 times)
- Duplicate changelog entry for 20170209git296153c5-3 (appears 2 times)
- Duplicate changelog entry for 20170209git296153c5-2 (appears 2 times)
- Changelog out of order: 20240524git3e722403cd16-9 appears before 20240524git3e722403cd16-17
12 tasks
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
The auto cherry-pick AI resolver produced several defects in this PR
that would either fail CI or ship a broken package:
SPECS/edk2/edk2.spec
- Restore two dropped comment lines above the "# verification with
ovmf-vars-generator" line (dropped-spec-section symptom).
- Remove a phantom duplicated -11/-10/-9 changelog block (with an
orphan bullet) that was inserted between the -18 and -17 entries.
The legitimate -11, -10, and -9 entries already exist further
down the changelog.
SPECS-SIGNED/edk2-hvloader-signed/edk2-hvloader-signed.spec
- Bump Release from 19 to 20 to lockstep with edk2.spec (fixes the
Spec Entanglement Mismatch Check failure).
- Add a new -20 changelog entry mirroring the edk2 bump.
- Restore the missing body on the -18 entry.
- Remove a misplaced duplicate -15 / -14 block sitting between -18
and -17 (the legitimate entries at those release numbers appear
further down).
- Remove a duplicate orphan "Bump release for consistency" bullet.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c3e2d86f-c397-4483-83b0-a200120fc5d5
jslobodzian
approved these changes
Sep 7, 2026
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an auto-generated pull request to cherry-pick commit fc2ef58 to 3.0-dev. Original PR: #18638
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.