# Pastebin 6ZmOUd4Q
trini@bill-the-cat:~/work/u-boot/u-boot (next)$ git log origin/next..
trini@bill-the-cat:~/work/u-boot/u-boot (next)$ git merge v2025.04-rc4
Auto-merging MAINTAINERS
Auto-merging Makefile
Auto-merging cmd/Kconfig
Auto-merging common/board_f.c
Auto-merging common/miiphyutil.c
CONFLICT (content): Merge conflict in common/miiphyutil.c
Auto-merging include/miiphy.h
Auto-merging lib/efi_loader/efi_net.c
CONFLICT (content): Merge conflict in lib/efi_loader/efi_net.c
Auto-merging tools/binman/ftest.py
Recorded preimage for 'common/miiphyutil.c'
Recorded preimage for 'lib/efi_loader/efi_net.c'
Automatic merge failed; fix conflicts and then commit the result.