Re: [U-Boot] [RFC Patch 0/5] Resolve conflict for merging