Hi!

On 26.11.18 13:25, Antony Pavlov wrote:
On Mon, 26 Nov 2018 10:17:58 +0100
Oleksij Rempel <o.rem...@pengutronix.de> wrote:

Hi!

I can't apply this patch to the master branch 'FIT: support hash-1/signature-1 
nodes in signature check' (6bacf7bd8df)

Here is git-am error log:

Applying: images: piggy: use "a" instead of #alloc flag
error: images/piggy.S: does not exist in index
Patch failed at 0001 images: piggy: use "a" instead of #alloc flag
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

This patch depends on:
[PATCH 0/3] ARM: images: Use piggydata

Currently not in next, Sasha will merge it this week.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to