Merge tag 'v2025.04-rc5' into next
authorTom Rini <trini@konsulko.com>
Tue, 25 Mar 2025 02:10:55 +0000 (20:10 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 25 Mar 2025 02:10:55 +0000 (20:10 -0600)
Prepare v2025.04-rc5

1  2 
Makefile
fs/fs.c
lib/lmb.c
test/lib/lmb.c

diff --cc Makefile
Simple merge
diff --cc fs/fs.c
Simple merge
diff --cc lib/lmb.c
+++ b/lib/lmb.c
@@@ -739,10 -703,18 +739,10 @@@ phys_addr_t lmb_alloc(phys_size_t size
  phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr,
                           uint flags)
  {
 -      phys_addr_t alloc;
 -
 -      alloc = _lmb_alloc_base(size, align, max_addr, flags);
 -
 -      if (alloc == 0)
 -              printf("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
 -                     (ulong)size, (ulong)max_addr);
 -
 -      return alloc;
 +      return _lmb_alloc_base(size, align, max_addr, flags);
  }
  
phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
int lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
  {
        long rgn;
        struct lmb_region *lmb_memory = lmb.available_mem.data;
diff --cc test/lib/lmb.c
Simple merge