Files
u-boot/.pickman-history
Simon Glass ce07e78917 pickman: Record cherry-pick of 8 commits from us/next
- e5565c24bb pinctrl: exynos: fix type of count integer
- 57e77dc80e arm: dts: e850-96: Remove TRNG node from appended dts
- 895b54998e configs: khadas-vim3{l}: fix userdata size
- ea2273911d arm: dts: meson: remove meson-a1.dtsi
- a5ed242ba6 dt-bindings: remove a1 bindings from include/
- 827edb6c00 dt-bindings: remove axg bindings from include/
- 1cdb4e03e6 dt-bindings: interrupt-controller: remove arm-gic.h from include/
- 030ec147af Merge tag 'u-boot-amlogic-next-20241113' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next
2025-12-15 16:20:22 -07:00

71 lines
2.9 KiB
Plaintext

## 2025-12-15: us/next
Branch: cherry-e5565c24bb4
Commits:
- e5565c24bb4 pinctrl: exynos: fix type of count integer
- 57e77dc80e0 arm: dts: e850-96: Remove TRNG node from appended dts
- 895b54998e5 configs: khadas-vim3{l}: fix userdata size
- ea2273911d3 arm: dts: meson: remove meson-a1.dtsi
- a5ed242ba6a dt-bindings: remove a1 bindings from include/
- 827edb6c00b dt-bindings: remove axg bindings from include/
- 1cdb4e03e68 dt-bindings: interrupt-controller: remove arm-gic.h from include/
- 030ec147af0 Merge tag 'u-boot-amlogic-next-20241113' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next
### Conversation log
Let me find the repository first:
The repository has uncommitted changes. Let me stash them first, then proceed with the cherry-pick operation:
Now let me create and checkout the new branch based on ci/master:
Now let me cherry-pick the first commit:
The commit is empty (likely already applied to master). Let me skip it and move on:
Now cherry-pick the second commit:
Now the final commit is a merge commit, so we need to use `-m 1`:
All cherry-picks were empty (the commits are already in master). Let me verify with git log:
The branch shows no new commits were added because all 8 commits were already present in ci/master (they showed as empty cherry-picks). Let me verify this by checking the status vs ci/master:
Let me verify the commits are indeed in ci/master by checking if those commits exist in the history:
All 8 commits are already in ci/master. Let me run the build verification anyway since the branch is at ci/master state:
## Final Status Report
### Cherry-Pick Summary
All 8 commits were **SKIPPED** because they are already present in `ci/master`:
| Commit | Subject | Status |
|--------|---------|--------|
| e5565c24bb4 | pinctrl: exynos: fix type of count integer | Already in master |
| 57e77dc80e0 | arm: dts: e850-96: Remove TRNG node from appended dts | Already in master |
| 895b54998e5 | configs: khadas-vim3{l}: fix userdata size | Already in master |
| ea2273911d3 | arm: dts: meson: remove meson-a1.dtsi | Already in master |
| a5ed242ba6a | dt-bindings: remove a1 bindings from include/ | Already in master |
| 827edb6c00b | dt-bindings: remove axg bindings from include/ | Already in master |
| 1cdb4e03e68 | dt-bindings: interrupt-controller: remove arm-gic.h from include/ | Already in master |
| 030ec147af0 | Merge tag 'u-boot-amlogic-next-20241113' | Already in master |
### Branch Status
- **Branch `cherry-e5565c24bb4`** was created but is identical to `ci/master` (0 commits ahead)
- No new commits to push since all cherry-picks were empty
### Build Result
- **Build: OK** ✓
- sandbox built successfully with no warnings or errors
### Fix-ups Made
- None required
### Notes
The requested commits have already been merged into `ci/master` previously, so there are no new changes to cherry-pick. The branch `cherry-e5565c24bb4` is left at `ci/master` HEAD.
---