From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marek.vasut@gmail.com>
Date: Tue, 8 May 2018 11:28:39 +0200
Subject: [U-Boot] [PATCH 1/4] i2c: rcar_i2c: Remove the driver
In-Reply-To: <535814a6-545b-0b83-2af5-3d33422af17d@denx.de>
References: <20180501070335.1815-1-marek.vasut+renesas@gmail.com>
 <535814a6-545b-0b83-2af5-3d33422af17d@denx.de>
Message-ID: <37019b1f-67ea-90e3-98a3-883e564cecee@gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
To: u-boot@lists.denx.de

On 05/08/2018 10:14 AM, Heiko Schocher wrote:
> Hello Marek,
>=20
> 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+renesas@gmail.com>
>> Cc: Heiko Schocher <hs@denx.de>
>> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> ---
>> =C2=A0 drivers/i2c/Makefile=C2=A0=C2=A0 |=C2=A0=C2=A0 1 -
>> =C2=A0 drivers/i2c/rcar_i2c.c | 293
>> -------------------------------------------------
>> =C2=A0 2 files changed, 294 deletions(-)
>> =C2=A0 delete mode 100644 drivers/i2c/rcar_i2c.c
>=20
> checkpatch says:
>=20
> 2018-05-08 03:12:02,870:CON=C2=A0=C2=A0=C2=A0 :tbotlib=C2=A0=C2=A0 # tb_c=
trl: =1B[33mWARNING:=1B[0m
> added, moved or deleted file(s), does MAINTAINERS need updating?
> #41:
> deleted file mode 100644
>=20
> total: 0 errors, 1 warnings, 0 checks, 7 lines checked
>=20
> NOTE: For some of the reported defects, checkpatch may be able to
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mechanically convert to the typical style =
using --fix or
> --fix-inplace.
>=20
> mbox has style problems, please review.
>=20
> And applying patch to current mainline fails:
>=20
> 2018-05-08 03:12:04,014:CON=C2=A0=C2=A0=C2=A0 :tbotlib=C2=A0=C2=A0 # tb_c=
trl: git am -3 mbox
> 2018-05-08 03:12:04,156:CON=C2=A0=C2=A0=C2=A0 :tbotlib=C2=A0=C2=A0 # tb_c=
trl: Applying: i2c:
> rcar_i2c: Remove the driver
> Using index info to reconstruct a base tree...
> M=C2=A0=C2=A0=C2=A0 drivers/i2c/Makefile
> M=C2=A0=C2=A0=C2=A0 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 at pollux [ 5:12:04] ttbott>
>=20
> see full log:
> http://xeidos.ddns.net/tbot/id_740/tbot.txt
>=20
> Before I make a dummy mistake, can you please rebase your patchset?
>=20
> Thanks!
>=20
> Hmm.. why do you remove the driver in this patch, and add it again
> in patch 2 ?

I am replacing it with a different/new driver, since the old one is broken.

> Isn;t it better to squash this 2 patches into one, so we see your
> changes?

No, that'd be just unreviewable mess. Review 2/4 as a new driver.

--=20
Best regards,
Marek Vasut