[Letux-kernel] LetuxOS: Kernel: m-latest 5.9-rc7 successful

[Andreas Kemnade]

On Mon, 12 Oct 2020 20:53:01 +0200
"H. Nikolaus Schaller" <hns at goldelico.com> wrote:

> Hi,
> 
> > Am 12.10.2020 um 20:36 schrieb Andreas Kemnade <andreas at kemnade.info>:
> > 
> > On Tue, 29 Sep 2020 11:49:52 +0200 (CEST)
> > hns at goldelico.com (H. Nikolaus Schaller) wrote:
> >   
> >> KVERSION: v5.9-rc7 - http://www.kernel.org
> >> CONFIGS:  arch/arm/configs/letux_defconfig arch/arm/configs/letux_lpae_defconfig arch/arm64/configs/letux_defconfig arch/mips/configs/letux_defconfig
> >> 
> >> Infos
> >> =====
> >> Project Home: http://projects.goldelico.com/p/gta04-kernel/
> >> Issues: http://projects.goldelico.com/p/gta04-kernel/issues/
> >> Original: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/?h=v5.9-rc7
> >> Elixir: https://elixir.bootlin.com/linux/v5.9-rc7/source
> >> 
> >> Downloads
> >> =========
> >> git: http://git.goldelico.com/?p=letux-kernel.git;a=shortlog;h=letux-5.9-rc7
> >> ARM: http://download.goldelico.com/letux-kernel/letux-5.9-rc7
> >> ARM-LPAE: http://download.goldelico.com/letux-kernel/letux-5.9-rc7-lpae
> >> ARM64: http://download.goldelico.com/letux-kernel/letux-5.9-rc7-arm64
> >> MIPS: http://download.goldelico.com/letux-kernel/letux-5.9-rc7-l400
> >> 
> >> Recent CHANGES (http://download.goldelico.com/letux-kernel/letux-5.9-rc7/src/CHANGES)
> >> ==============
> >> letux-5.9-rc7 Tue Sep 29 09:40:12 CEST 2020:
> >> * Kobolino: update EPDC and fuel gauge so that X11 works - at least on Tolino Shine 3 (by Andreas Kemnade <andreas at kemnade.info>)  
> > 
> > in cleartext: fix EPDC, add a duplicated driver for power supply:
> > andi at aktux:~/kernel$ git diff goldelico2/letux-5.9-rc6 goldelico2/letux-5.9-rc7 -- drivers/mfd/rn5t618.c
> > diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c
> > index b8714478e9e9..65fe175572b2 100644
> > --- a/drivers/mfd/rn5t618.c
> > +++ b/drivers/mfd/rn5t618.c
> > @@ -28,6 +28,7 @@ static const struct mfd_cell rc5t619_cells[] = {
> >          .of_compatible = "ricoh,rn5t618-adc" },
> >        { .name = "rn5t618-power",
> >          .of_compatible = "ricoh,rn5t618-power" },
> > +       { .name = "rn5t618-gauge" },
> >        { .name = "rn5t618-regulator" },
> >        { .name = "rc5t619-rtc" },
> >        { .name = "rn5t618-wdt" },
> > andi at aktux:~/kernel$ 
> > 
> > Whereever that accident comes from...  
> 
> I think I remember some merge/rebase conflict a while ago.
> 
> > Apparently the first (differently named version of that driver was
> > merged in additionally. Maybe some rename-detection did fail during
> > rebasing.  
> 
> Maybe my fixup decision during rebase was wrong...
> 
> Anyways it works for some reason. Maybe the duplicate driver is not compiled.
> 
> If you are quicker than me, please can you make a patch that does a fixup?
> 
well, just:
commit a79fb1de7c9847131280ee03d4ec969c7783d3db (HEAD -> tmp)
Author: Andreas Kemnade <andreas at kemnade.info>
Date:   Mon Oct 12 21:21:39 2020 +0200

    Revert "power: supply: add fuel gauge driver for RN5T618 family"
    
    This reverts commit 0cadfe8b4716074bda757c2071a55a19232168ea.

commit f4ca2e8ef8c54fe395fb3dc47ae79f5c0ede27ae
Author: Andreas Kemnade <andreas at kemnade.info>
Date:   Mon Oct 12 21:21:25 2020 +0200

    Revert "mfd: rn5t618: add fuel gauge subdevice"
    
    This reverts commit 7d11fc03ff515dcb2103b50f9501897f07f52cd0.

I also pushed a cleaned-up v4 (for future rebases)

Regards,
Andreas