Hi Alexandre, > This didn't apply cleanly, please check rtc-next. I don't think I made any > mistake > as the issue was only in Kconfig. You probably based your patches on 4.9 > instead of 4.10-rc1. Sorry for this inconvenience. You're right, my patches were based on 4.9 to be tested on stm32f4 family. No mistake found in your conflict resolution in Kconfig.
I'm going to send a new patch to fix warnings introduced by my driver on rtc-next. Regards, Amelie > -----Original Message----- > From: Alexandre Belloni [mailto:[email protected]] > Sent: vendredi 13 janvier 2017 01:39 > To: Amelie DELAUNAY <[email protected]> > Cc: Alessandro Zummo <[email protected]>; Rob Herring > <[email protected]>; Mark Rutland <[email protected]>; Maxime > Coquelin <[email protected]>; Alexandre TORGUE > <[email protected]>; Russell King <[email protected]>; rtc- > [email protected]; [email protected]; linux-arm- > [email protected]; [email protected]; Gabriel FERNANDEZ > <[email protected]> > Subject: Re: [PATCHv5 3/8] rtc: add STM32 RTC driver > > On 11/01/2017 at 14:46:43 +0100, Amelie Delaunay wrote : > > This patch adds support for the STM32 RTC. > > > > Signed-off-by: Amelie Delaunay <[email protected]> > > --- > > drivers/rtc/Kconfig | 11 + > > drivers/rtc/Makefile | 1 + > > drivers/rtc/rtc-stm32.c | 727 > > ++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 739 insertions(+) > > create mode 100644 drivers/rtc/rtc-stm32.c > > > > This didn't apply cleanly, please check rtc-next. I don't think I made any > mistake > as the issue was only in Kconfig. You probably based your patches on 4.9 > instead of 4.10-rc1. > > > -- > Alexandre Belloni, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com
