| 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
| ||
|
Date: Fri, 26 Jun 2015 09:41:24 +0200 From: Alexandre Belloni <alexandre.belloni@...e-electrons.com> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: rtc-linux@...glegroups.com, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: Re: [GIT PULL] RTC for 4.2 On 25/06/2015 at 18:59:48 -0700, Linus Torvalds wrote : > Looks fine, but: > > > Conflicts: > > drivers/rtc/Makefile > > > > Trivial add/add conflicts with the mfd tree, solved in linux-next > > Resolution: take both sides. > > That's not the resolution I took - the re-sorting of the file made for > more complex. > > Can you check my resolution? > I've checked and it is correct. Thanks! -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists