Re: [PATCH V1] mfd: da9061: fix to remove BBAT_CONT register from chip model

[Lee Jones]

On Mon, 14 Aug 2017, Steve Twiss wrote:
> On 06 June 2017 08:16, Lee Jones wrote:

> > >  drivers/mfd/da9062-core.c | 6 ------
> > >  1 file changed, 6 deletions(-)
> > 
> > Applied, thanks.
> 
> $ git describe
> v4.13-rc5
> 
> Looking at linux-mainline today, I noticed a commit that seems to be applied
> twice. This patch I sent on 5th June seems to have been duplicated and applied for
> a second time (to the same file), and this has resulted in an error.
> 
> $ git log --oneline --author="diasemi.com" -2
> 
> b77eb79 mfd: da9061: Fix to remove BBAT_CONT register from chip model
> 2cd6496 mfd: da9061: Fix to remove BBAT_CONT register from chip model
> 
> $ git log --pretty=format:"%h, %cn, %s" | grep b77eb79
> b77eb79, Lee Jones, mfd: da9061: Fix to remove BBAT_CONT register from chip model
> 
> Could you revert the b77eb79 commit please?
> 
> The original patch only applies to the DA9061 chip model and by duplicating my original
> submission and applying b77eb79, it has also made the same change to the DA9062 chip
> model. This is incorrect. The DA9062 and DA90861 chip models are different.

Interesting.  Not sure how that happened.

Sorry for not noticing that sooner.

Will fix.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog