pickman: Record cherry-pick of 4 commits from us/next
-b20c51bc45usb: ehci-mx5: Use regulator_set_enable_if_allowed -addcb09fd5usb: ehci-mx6: Use regulator_set_enable_if_allowed -801b5fafd3usb: ehci-mx6: Add i.MX95 support -6a0db9ee03Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-usb
This commit is contained in:
Simon Glass
114
.pickman-history
114
.pickman-history
@@ -777,44 +777,53 @@ All 3 commits are present. Now let me run the build verification:
|
||||
|
||||
## 2025-12-20: us/next
|
||||
|
||||
Branch: cherry-5b5124e3d5c
|
||||
Branch: cherry-b20c51bc45c
|
||||
|
||||
Commits:
|
||||
- 5b5124e3d5c watchdog: rti: support SPL (or re-start)
|
||||
- 5964f24f154 watchdog: rti: drop hack manipulating WDT clock rate
|
||||
- 121e62e8af0 Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
|
||||
- b20c51bc45c usb: ehci-mx5: Use regulator_set_enable_if_allowed
|
||||
- addcb09fd50 usb: ehci-mx6: Use regulator_set_enable_if_allowed
|
||||
- 801b5fafd35 usb: ehci-mx6: Add i.MX95 support
|
||||
- 6a0db9ee030 Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-usb
|
||||
|
||||
### Conversation log
|
||||
The repository is clean. Now let me create and checkout the new branch based on ci/master:
|
||||
The repository state is clean. Now let me create and checkout the new branch based on ci/master:
|
||||
|
||||
Now let me cherry-pick the first commit:
|
||||
Now I'll cherry-pick each commit one at a time. Let me start with the first commit:
|
||||
|
||||
First commit cherry-picked successfully. Now let me cherry-pick the second commit:
|
||||
First commit succeeded. Now the second commit:
|
||||
|
||||
Second commit cherry-picked successfully. Now let me cherry-pick the third commit, which is a merge commit (identified by "Merge" in the subject):
|
||||
Second commit succeeded. Now the third commit:
|
||||
|
||||
The merge commit is empty (as expected, since the individual commits were already picked). I need to continue with an empty commit to preserve the merge commit message:
|
||||
Third commit succeeded. Now the fourth commit (merge commit - need to use -m 1 --allow-empty):
|
||||
|
||||
All three commits have been cherry-picked. Let me verify with git log:
|
||||
The merge commit is empty (as expected since the changes are already included in previous commits). I need to commit it with --allow-empty as instructed:
|
||||
|
||||
All 3 commits are present. Now let me run the build verification:
|
||||
All 4 cherry-picks are complete. Let me verify with git log:
|
||||
|
||||
The build completed successfully. Here's the final status report:
|
||||
All 4 commits are present. Now let me run the build verification:
|
||||
|
||||
The build completed successfully. Here's the final status summary:
|
||||
|
||||
## Cherry-Pick Summary
|
||||
|
||||
**Branch created:** `cherry-5b5124e3d5c` (based on `ci/master`)
|
||||
**Branch:** `cherry-b20c51bc45c` (based on `ci/master`)
|
||||
|
||||
**Commits cherry-picked (3/3):**
|
||||
1. `55db447bcf8` - watchdog: rti: support SPL (or re-start) ✅
|
||||
2. `3a969496500` - watchdog: rti: drop hack manipulating WDT clock rate ✅
|
||||
3. `1705b9fcfb8` - Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog ✅ (empty commit preserved)
|
||||
**Commits cherry-picked (4 total):**
|
||||
| # | Hash | Subject |
|
||||
|---|------|---------|
|
||||
| 1 | cf51cb30b61 | usb: ehci-mx5: Use regulator_set_enable_if_allowed |
|
||||
| 2 | a6ce5fbfe44 | usb: ehci-mx6: Use regulator_set_enable_if_allowed |
|
||||
| 3 | 02922acaf7c | usb: ehci-mx6: Add i.MX95 support |
|
||||
| 4 | d9fc12a4c83 | Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-usb |
|
||||
|
||||
**Build result:** ✅ OK - No warnings or errors
|
||||
**Build result:** ✅ OK (sandbox build completed successfully, no warnings or errors)
|
||||
|
||||
**Fix-ups made:** None required
|
||||
**Fix-ups made:** None - all cherry-picks applied cleanly
|
||||
|
||||
The branch `cherry-5b5124e3d5c` is ready for pushing.
|
||||
**Notes:**
|
||||
- The merge commit (6a0db9ee030) resulted in an empty commit (as expected, since the individual commits were already cherry-picked), but was preserved using `--allow-empty` to maintain history tracking.
|
||||
|
||||
The branch `cherry-b20c51bc45c` is ready for pushing.
|
||||
|
||||
---
|
||||
|
||||
@@ -889,68 +898,3 @@ The build completed successfully.
|
||||
The branch `cherry-ddb0f26dc45` is ready for pushing.
|
||||
|
||||
---
|
||||
|
||||
### Review: 2025-12-20
|
||||
|
||||
Branch: cherry-5b5124e3d5c
|
||||
|
||||
Comments addressed:
|
||||
|
||||
|
||||
### Conversation log
|
||||
Let me find the correct directory:
|
||||
|
||||
Good, I'm already in the correct directory. Now let me checkout the branch and rebase:
|
||||
|
||||
Now let me fetch the latest ci/master and perform the rebase:
|
||||
|
||||
Good, ci/master is updated. Now let me check the current base and then rebase:
|
||||
|
||||
There's a conflict in `.pickman-history`. This is a history tracking file that just appends entries. Let me resolve it:
|
||||
|
||||
This is a conflict in the `.pickman-history` file which just tracks history entries. I should keep both entries. Let me resolve this:
|
||||
|
||||
I see, the file has conflict markers. For `.pickman-history`, the proper resolution is to keep both entries (the one from HEAD and the one being rebased). Let me resolve this by keeping the content from HEAD first, then appending the content from the rebase:
|
||||
|
||||
The rebase completed successfully. Let me verify the result:
|
||||
|
||||
The rebase was successful. The commits are now based on the latest `ci/master`. Now let me run the build verification:
|
||||
|
||||
Build passed. Now let me check if there's already a `-v2` branch and create the appropriate versioned local branch:
|
||||
|
||||
No existing versioned branches. Let me create the `-v2` branch:
|
||||
|
||||
Now let me force push to the original remote branch to update the MR:
|
||||
|
||||
The pickman command doesn't have a `push-branch` subcommand. Let me push directly using git:
|
||||
|
||||
The push was successful. Let me provide a summary of what was done:
|
||||
|
||||
## Rebase Summary
|
||||
|
||||
### Actions Performed:
|
||||
1. ✅ Checked out branch `cherry-5b5124e3d5c`
|
||||
2. ✅ Fetched latest `ci/master`
|
||||
3. ✅ Rebased onto latest `ci/master` with `--keep-empty`
|
||||
4. ✅ Resolved conflict in `.pickman-history` (history tracking file - kept the current branch's entry)
|
||||
5. ✅ Build verification passed (`crosfw sandbox -L`)
|
||||
6. ✅ Created local backup branch `cherry-5b5124e3d5c-v2`
|
||||
7. ✅ Force pushed to remote branch `cherry-5b5124e3d5c` to update MR
|
||||
|
||||
### Commit Log After Rebase:
|
||||
```
|
||||
4d6e295c223 pickman: Record cherry-pick of 3 commits from us/next
|
||||
acf5c3fc886 Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
|
||||
c782a155f8c watchdog: rti: drop hack manipulating WDT clock rate
|
||||
fd49c8493de watchdog: rti: support SPL (or re-start)
|
||||
```
|
||||
|
||||
### Pipeline Triggered:
|
||||
MR !265: https://concept.u-boot.org/u-boot/u-boot/-/merge_requests/265
|
||||
|
||||
### Suggested Reply to MR:
|
||||
```
|
||||
Rebased onto latest ci/master. A new pipeline has been triggered to verify the changes.
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
Reference in New Issue
Block a user