Dear Matthias Weisser, In message <[email protected]> you wrote: > If both LZMA and LZO compressions are used there is a compile error > in cmd_bootm.c > > Signed-off-by: Matthias Weisser <[email protected]> > --- > common/cmd_bootm.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-)
Hm... doesn't apply: Applying: LZMA and LZO causes compile error Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging common/cmd_bootm.c CONFLICT (content): Merge conflict in common/cmd_bootm.c Failed to merge in the changes. Patch failed at 0001 LZMA and LZO causes compile error When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". OK, applied manually. 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: [email protected] After Goliath's defeat, giants ceased to command respect. - Freeman Dyson _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
