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: Wed, 6 Aug 2014 21:05:26 -0700 From: Linus Torvalds <torvalds@...ux-foundation.org> To: Jiri Kosina <jkosina@...e.cz> Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: Re: [GIT PULL] trivial for 3.17 On Wed, Aug 6, 2014 at 2:37 AM, Jiri Kosina <jkosina@...e.cz> wrote: > > You are going to get two conflicts super-easy to resolve: > > - arch/arm/mach-msm/Kconfig removal of unused MSM_SCM config value > conflicts with addition of MSM_TIMER to the same spot; resolution is to > keep MSM_TIMER and remove MSM_SCM That's not right. Both MSM_TIMER and MSM_SCM went away. > - Documentation/laptops/hpfall.c conflict easy to resolve by Looks correct. Linus -- 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