Hello Marek,
Am 01.05.2018 um 09:03 schrieb Marek Vasut:
Remove the rcar_i2c driver, since it's no longer used by any
board and will be superseded by a DM and DT capable variant.
Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
Cc: Heiko Schocher <h...@denx.de>
Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
drivers/i2c/Makefile | 1 -
drivers/i2c/rcar_i2c.c | 293 -------------------------------------------------
2 files changed, 294 deletions(-)
delete mode 100644 drivers/i2c/rcar_i2c.c
checkpatch says:
2018-05-08 03:12:02,870:CON :tbotlib # tb_ctrl: [33mWARNING:[0m added, moved or deleted
file(s), does MAINTAINERS need updating?
#41:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 checks, 7 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
mbox has style problems, please review.
And applying patch to current mainline fails:
2018-05-08 03:12:04,014:CON :tbotlib # tb_ctrl: git am -3 mbox
2018-05-08 03:12:04,156:CON :tbotlib # tb_ctrl: Applying: i2c: rcar_i2c:
Remove the driver
Using index info to reconstruct a base tree...
M drivers/i2c/Makefile
M drivers/i2c/rcar_i2c.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/i2c/rcar_i2c.c deleted in i2c: rcar_i2c: Remove the driver and
modified in HEAD. Version HEAD of drivers/i2c/rcar_i2c.c left in tree.
Auto-merging drivers/i2c/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 i2c: rcar_i2c: Remove the driver
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
hs@pollux [ 5:12:04] ttbott>
see full log:
http://xeidos.ddns.net/tbot/id_740/tbot.txt
Before I make a dummy mistake, can you please rebase your patchset?
Thanks!
Hmm.. why do you remove the driver in this patch, and add it again
in patch 2 ?
Isn;t it better to squash this 2 patches into one, so we see your
changes?
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
