lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <be3a19059b2e4e0a9bfb8d0c3292dac4@SFHDAG3NODE2.st.com>
Date:   Fri, 13 Jan 2017 08:47:37 +0000
From:   Amelie DELAUNAY <amelie.delaunay@...com>
To:     Alexandre Belloni <alexandre.belloni@...e-electrons.com>
CC:     Alessandro Zummo <a.zummo@...ertech.it>,
        Rob Herring <robh+dt@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Maxime Coquelin <mcoquelin.stm32@...il.com>,
        Alexandre TORGUE <alexandre.torgue@...com>,
        Russell King <linux@...linux.org.uk>,
        "rtc-linux@...glegroups.com" <rtc-linux@...glegroups.com>,
        "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Gabriel FERNANDEZ <gabriel.fernandez@...com>
Subject: RE: [PATCHv5 3/8] rtc: add STM32 RTC driver

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@...e-electrons.com]
> Sent: vendredi 13 janvier 2017 01:39
> To: Amelie DELAUNAY <amelie.delaunay@...com>
> Cc: Alessandro Zummo <a.zummo@...ertech.it>; Rob Herring
> <robh+dt@...nel.org>; Mark Rutland <mark.rutland@....com>; Maxime
> Coquelin <mcoquelin.stm32@...il.com>; Alexandre TORGUE
> <alexandre.torgue@...com>; Russell King <linux@...linux.org.uk>; rtc-
> linux@...glegroups.com; devicetree@...r.kernel.org; linux-arm-
> kernel@...ts.infradead.org; linux-kernel@...r.kernel.org; Gabriel FERNANDEZ
> <gabriel.fernandez@...com>
> 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 <amelie.delaunay@...com>
> > ---
> >  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

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ