[U-Boot] [PATCH 1/2] patman: Change the location of the config file

[Wolfgang Denk <wd@denx.de>]

Dear Vikram Narayanan,

In message <4FA961AE.6080906@gmail.com> you wrote:
> Move the config file from ~/.config/patman to ~/.patman
> as it is more appropriate to have it there.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  tools/patman/settings.py |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

Sorry, this patch does not apply:

Applying patch #157765 to current directory
Description: [U-Boot,1/2] patman: Change the location of the config
file
Applying: patman: Change the location of the config file
fatal: sha1 information is lacking or useless
(tools/patman/settings.py).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 patman: Change the location of the config file


Please fix 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
Ninety-Ninety Rule of Project Schedules:
        The first ninety percent of the task takes ninety percent of
the time, and the last ten percent takes the other ninety percent.