linux-kernel - Re: [GIT PULL] RTC for 4.13

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: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20170713181846.xdoocvlziyfhrajk@piout.net>
Date:   Thu, 13 Jul 2017 20:18:46 +0200
From:   Alexandre Belloni <alexandre.belloni@...e-electrons.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     linux-rtc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] RTC for 4.13

Me again...

On 13/07/2017 at 11:22:39 +0200, Alexandre Belloni wrote:
> On 13/07/2017 at 11:01:51 +0200, Alexandre Belloni wrote:
> > Hi Linus,
> > 
> > Here is the pull-request for the RTC subsystem for 4.13.
> > 
> 
> And I forgot to add that you will see a small Add/Add merge conflict in
> tools/testing/selftests/timers/Makefile which is easy to solve.
> 

And its not actually add/add but both patches are adding a target on a
different line.

Sorry about the miscommunication, I'll get back to wiping baby poop.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com