[U-Boot] [PATCH V2] qemu_mips: move env storage just after u-boot

[Wolfgang Denk <wd@denx.de>]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <1220909525-14187-1-git-send-email-plagnioj@jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> Use CFG_MONITOR_LEN instead of value
>  include/configs/qemu-mips.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Does not apply:

Applying qemu_mips: move env storage just after u-boot
error: patch failed: include/configs/qemu-mips.h:150
error: include/configs/qemu-mips.h: patch does not apply
fatal: sha1 information is lacking or useless
(include/configs/qemu-mips.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Severe culture shock results when experts from another protocol suite
[...] try to read OSI documents. The term "osified" is used to  refer
to  such  documents. [...] Any relationship to the word "ossified" is
purely intentional.                                - Marshall T. Rose