[U-Boot] [PATCH] I2C: adding new "i2c bus" Command to the I2C Subsystem.

[Wolfgang Denk]

Dear Heiko Schocher,

In message <48E08A1B.7000409 at denx.de> you wrote:
> With this Command it is possible to add new I2C Busses,
> which are behind 1 .. n I2C Muxes. Details see README.
> 
> Signed-off-by: Heiko Schocher <hs at denx.de>
> ---
>  README                   |   47 ++++++++
>  common/cmd_i2c.c         |  269 +++++++++++++++++++++++++++++++++++++++++++++-
>  cpu/mpc8260/i2c.c        |   15 +++-
>  drivers/i2c/soft_i2c.c   |   15 +++-
>  include/configs/mgcoge.h |    1 +
>  include/configs/mgsuvd.h |    1 +
>  include/i2c.h            |   23 ++++
>  7 files changed, 368 insertions(+), 3 deletions(-)

Does not apply:

Applying I2C: adding new "i2c bus" Command to the I2C Subsystem.
.dotest/patch:50: trailing whitespace.
                =>
.dotest/patch:269: trailing whitespace.

.dotest/patch:271: trailing whitespace.

error: patch failed: include/configs/mgcoge.h:203
error: include/configs/mgcoge.h: patch does not apply
error: patch failed: include/configs/mgsuvd.h:373
error: include/configs/mgsuvd.h: patch does not apply
fatal: sha1 information is lacking or useless (drivers/i2c/soft_i2c.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0006.


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
We are all agreed that your  theory  is  crazy.  The  question  which
divides  us  is  whether it is crazy enough to have a chance of being
correct. My own feeling is that it is not crazy enough.  - Niels Bohr