From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marian Balakowicz <m8@semihalf.com>
Date: Tue, 15 Jan 2008 11:35:18 +0100
Subject: [U-Boot-Users] [PATCH 02/13] [new uImage] Define a API for
 image handling operations
In-Reply-To: <20080112004855.BBC6324827@gemini.denx.de>
References: <20080112004855.BBC6324827@gemini.denx.de>
Message-ID: <478C8C66.5000501@semihalf.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Wolfgang Denk wrote:
> in message <20080111142800.8025.66590.stgit@hekate.izotz.org> you wrote:
>> - Add inline helper macros for basic header processing
>> - Move common non inline code common/image.c
>> - Replace direct header access with the API routines
>> - Rename IH_CPU_* to IH_ARCH_*
>>
>> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
> 
> I tried to apply your patches to the u-boot-testing repository;
> unfortunately, this does now work:
> 
> -> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/13330
> Commit Body is:
> --------------------------
> Define a API for image handling operations
> 
> - Add inline helper macros for basic header processing
> - Move common non inline code common/image.c
> - Replace direct header access with the API routines
> - Rename IH_CPU_* to IH_ARCH_*
> 
> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
> --------------------------
> Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
> 
> Applying Define a API for image handling operations
> 
> error: No changes
> Using index info to reconstruct a base tree...
> error: No changes
> Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Cannot fall back to three-way merge.
> Patch failed at 0001.
> When you have resolved this problem run "git-am -i -3 --resolved".
> If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
> 
> 
> Can you please check and - if necessary - rebase the patch set?

The baseline was "Release v1.3.1" commit, I'll rebase to current HEAD
as there are some conflicts with the latest commits.

But from the above it seems that you were attempting to apply patch
02/13 for which patch body was not posted to the ml?

Cheers,
m.