From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751392AbdAMJPY convert rfc822-to-8bit (ORCPT ); Fri, 13 Jan 2017 04:15:24 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:53543 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751146AbdAMJPW (ORCPT ); Fri, 13 Jan 2017 04:15:22 -0500 From: Amelie DELAUNAY To: Alexandre Belloni CC: Alessandro Zummo , Rob Herring , Mark Rutland , Maxime Coquelin , Alexandre TORGUE , Russell King , "rtc-linux@googlegroups.com" , "devicetree@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Gabriel FERNANDEZ Subject: RE: [PATCHv5 3/8] rtc: add STM32 RTC driver Thread-Topic: [PATCHv5 3/8] rtc: add STM32 RTC driver Thread-Index: AQHSbBElZ5EBcyaIG0mRZXX0kwyFkKE1gd8AgACX1iA= Date: Fri, 13 Jan 2017 08:47:37 +0000 Message-ID: References: <1484142403-11556-1-git-send-email-amelie.delaunay@st.com> <20170113003840.u6uxt7u4qsit3oqt@piout.net> In-Reply-To: <20170113003840.u6uxt7u4qsit3oqt@piout.net> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.75.127.48] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-01-13_05:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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:alexandre.belloni@free-electrons.com] > Sent: vendredi 13 janvier 2017 01:39 > To: Amelie DELAUNAY > Cc: Alessandro Zummo ; Rob Herring > ; Mark Rutland ; Maxime > Coquelin ; Alexandre TORGUE > ; Russell King ; rtc- > linux@googlegroups.com; devicetree@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Gabriel FERNANDEZ > > 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 > > --- > > 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