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, 23 Nov 2015 10:45:39 +0900 From: Krzysztof Kozlowski <k.kozlowski@...sung.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Daniel Lezcano <daniel.lezcano@...aro.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Alim Akhtar <alim.akhtar@...sung.com> Subject: Re: linux-next: manual merge of the clockevents tree with the samsung-krzk tree On 23.11.2015 10:22, Stephen Rothwell wrote: > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/mach-exynos/Kconfig > > between commit: > > 23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff") > > from the samsung-krzk tree and commit: > > b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option") > > from the clockevents tree. > > OK, so these entries were sorted at one point for a reason :-( > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks, merge fix looks good. Indeed we should have put them in alphabetical order. Best regards, Krzysztof -- 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