smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pickman: Record review handling for cherry-ddb0f26dc45

Browse Source
This commit is contained in:
Simon Glass
2025-12-20 12:32:13 -07:00
parent d29e87da85
commit 58dc5263e2
1 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
.pickman-history
View File

@@ -1030,3 +1030,64 @@ Rebased onto latest ci/master. Build verified OK.
---
### Review: 2025-12-20
Branch: cherry-ddb0f26dc45
Comments addressed:
### Conversation log
Let me find the correct repository location:
I'm already in the u-boot repository. Let me proceed with the rebase:
I can see the branch has 6 commits ahead of the base. The ci/master has moved forward significantly. Let me check the merge base and proceed with the rebase:
Now let me rebase onto ci/master:
The rebase was successful. Let me verify the result:
The rebase was successful - we have 5 commits ahead of ci/master. Note that one of the previous pickman commits was skipped (as it was already applied to ci/master). Now let me run the build verification:
Build succeeded. Now let me check for existing version branches and create the new versioned branch:
There's already a v2 branch, so I need to create v3:
The push failed due to stale info. Let me fetch and retry:
Let me try a direct git push instead:
The push was successful. Let me verify the final state:
## Summary
**Rebase completed successfully** for MR !267 (branch: `cherry-ddb0f26dc45`)
### What was done:
1. **Checked out** the branch `cherry-ddb0f26dc45`
2. **Rebased** onto latest `ci/master` using `git rebase --keep-empty ci/master`
- Note: One commit (`cffc1f60548 pickman: Record cherry-pick of 4 commits...`) was skipped as it was already applied to ci/master
3. **Verified build** - sandbox build completed successfully
4. **Created local branch** `cherry-ddb0f26dc45-v3` for tracking
5. **Force pushed** to remote `ci/cherry-ddb0f26dc45` to update the MR
### Commits on the rebased branch (5 commits ahead of ci/master):
1. `7a50cddaeb9` - arm64: Convert core type check macros into inline functions
2. `a13c388a63f` - arm64: Add MIDR entries for Cortex-A57 and Cortex-A76
3. `2cee86cd4cf` - arm64: renesas: Convert boards over to is_cortex_a() functions
4. `347fcc08575` - Merge branch 'master' of u-boot-sh (empty commit)
5. `8c542accea4` - pickman: Record review handling for cherry-ddb0f26dc45
### Build result:
- **OK** - sandbox board builds successfully
### Suggested MR reply:
```
Rebased onto latest ci/master. Build verified OK.
Pipeline triggered at: https://concept.u-boot.org/u-boot/u-boot/-/merge_requests/267
```
---