[U-Boot] [PATCH 1/4] config_defaults.h: new header for common u-boot config defaults

[Wolfgang Denk <wd@denx.de>]

Dear Mike Frysinger,

In message <1257371196-11360-1-git-send-email-vapier@gentoo.org> you wrote:
> There are a bunch of features in U-Boot that we want to enable by default,
> and it's best if we centralize them in one place rather than updating all
> the board files out there.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  common/cmd_bootm.c        |    4 ----
>  include/config_defaults.h |   17 +++++++++++++++++
>  mkconfig                  |    7 +++++--
>  3 files changed, 22 insertions(+), 6 deletions(-)
>  create mode 100644 include/config_defaults.h

Sorry, but does not apply:

Applying: config_defaults.h: new header for common u-boot config
defaults
error: patch failed: mkconfig:89
error: mkconfig: patch does not apply
fatal: sha1 information is lacking or useless (common/cmd_bootm.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 config_defaults.h: new header for common u-boot config defaults

Please rebase patch series against "next" branch and resubmit.
Thanks.

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
Some people march to the beat of a different drummer. And some people
tango!