Merge of v2025.04-rc4 in to next

[Tom Rini]

On Mon, Mar 10, 2025 at 05:46:51PM -0600, Tom Rini wrote:

> Hey,
> 
> Attempting to merge v2025.04-rc4 in to -next fails on two files. One of
> which is common/miiphyutil.c and is easily solved (miiphy_init() goes
> away) and then lib/efi_loader/efi_net.c. The latter I need help with,
> ideally one of you, as you understand the code in question, sends me the
> merged file off-list and I'll drop that in, or points me at a tree with
> the merge done and I'll work it out from there. Thanks!

After talking with Heinrich on IRC this is resolved.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20250310/c761cf2e/attachment.sig>