Merge branch 'next'

Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc board/starfive/visionfive2/spl.c
Simple merge

diff --cc cmd/Kconfig
index ce8393c72da690af509c0f326fb2cf0f66767b4f,ddffa81613aaf7fb22f90be1956e59bd9a398270..ecef664fceac1d1d27c631929a8ea8737d4f76f5
--- 1/cmd/Kconfig
--- 2/cmd/Kconfig
+++ b/cmd/Kconfig
@@@ -2168,6 -2184,30 +2177,28 @@@ config WGET_HTTP
        help
          Enable TLS over http for wget.
  
 -endif  # if CMD_NET
 -
+ config WGET_CACERT
+       bool "wget cacert"
+       depends on CMD_WGET
+       depends on WGET_HTTPS
+       help
+         Adds the "cacert" sub-command to wget to provide root certificates
+         to the HTTPS engine. Must be in DER format.
+ 
+ config WGET_BUILTIN_CACERT
+       bool "Built-in CA certificates"
+       depends on WGET_HTTPS
+       select BUILD_BIN2C
+ 
+ config WGET_BUILTIN_CACERT_PATH
+       string "Path to root certificates"
+       depends on WGET_BUILTIN_CACERT
+       default "cacert.crt"
+       help
+         Set this to the path to a DER-encoded X509 file containing
+         Certification Authority certificates, a.k.a. root certificates, for
+         the purpose of authenticating HTTPS connections.
+ 
  config CMD_PXE
        bool "pxe"
        select PXE_UTILS

diff --cc cmd/net-lwip.c
Simple merge

diff --cc configs/sama5d27_giantboard_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_mmc1_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_qspiflash_defconfig
Simple merge

diff --cc configs/sama5d27_wlsom1_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d27_wlsom1_ek_qspiflash_defconfig
Simple merge

diff --cc drivers/misc/qfw_acpi.c
Simple merge

diff --cc include/net-common.h
Simple merge

diff --cc lib/efi_loader/efi_boottime.c
index eaa6464fa393a5a6520d52b71eeb8ca81eb9dee3,c8d9a6037f780a71ba3e052bc0ff74cd7977caf1..f220daa048f4a065f884092a8b0defe48f137a9f
--- 1/lib/efi_loader/efi_boottime.c
--- 2/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@@ -2234,10 -2231,6 +2232,8 @@@ static efi_status_t EFIAPI efi_exit_boo
  
        if (!efi_st_keep_devices) {
                bootm_disable_interrupts();
-               if (IS_ENABLED(CONFIG_USB_DEVICE))
-                       udc_disconnect();
 +              if (IS_ENABLED(CONFIG_DM_ETH))
 +                      eth_halt();
                board_quiesce_devices();
                dm_remove_devices_active();
        }

diff --cc net/lwip/net-lwip.c
Simple merge