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

pickman: Record cherry-pick of 3 commits from us/next

Browse Source 
- 118a10e1dd ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car
- 70da4f2859 net: rswitch: Do not register disabled ports as ethernet devices
- 0d05bd2058 Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
This commit is contained in:
Simon Glass
2025-12-19 17:16:09 -07:00
parent ce5ae4b69e
commit 1359c089af
1 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
.pickman-history
View File

@@ -732,3 +732,46 @@ The build completed successfully. Let me provide a summary:
---
## 2025-12-19: us/next
Branch: cherry-118a10e1dde
Commits:
- 118a10e1dde ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car
- 70da4f28592 net: rswitch: Do not register disabled ports as ethernet devices
- 0d05bd2058b Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh
### Conversation log
The repository is clean. Now let me create and checkout the new branch based on ci/master:
Now let me cherry-pick the first commit:
First commit cherry-picked successfully. Now the second commit:
Second commit cherry-picked successfully. Now the third commit which is a merge commit:
The merge commit is empty (expected since the parent commits were already cherry-picked). Let me commit it as an empty commit to preserve the merge message:
All three commits cherry-picked successfully. Let me verify with git log:
All 3 commits are present. Now let me run the build verification:
## Final Status
**Cherry-pick Summary:**
- ✅ All 3 commits successfully cherry-picked to branch `cherry-118a10e1dde`
| Commit | Subject | Status |
|--------|---------|--------|
| 118a10e1dde | ARM: renesas: Consistently enable ENV_OVERWRITE on Renesas R-Car | ✅ Cherry-picked |
| 70da4f28592 | net: rswitch: Do not register disabled ports as ethernet devices | ✅ Cherry-picked |
| 0d05bd2058b | Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh | ✅ Cherry-picked (empty commit) |
**Build Result:** ✅ **OK** - 1 board built successfully, no warnings or errors
**Fix-ups Made:** None - all cherry-picks applied cleanly
**Branch Status:** `cherry-118a10e1dde` is ready for pushing, 3 commits ahead of `ci/master`
---