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: Mon, 17 Aug 2015 11:36:17 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: "Rafael J. Wysocki" <rjw@...ysocki.net>, Kukjin Kim <kgene.kim@...sung.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Shailendra Verma <shailendra.capricorn@...il.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com> Subject: linux-next: manual merge of the pm tree with the samsung tree Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/cpufreq/exynos-cpufreq.c between commit: 966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support") from the samsung tree and commit: 62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match") from the pm tree. I fixed it up (I just removed the file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- 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