linux-kernel - Re: [PATCH] power: fix a build breakage on latest -tip

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] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 9 Feb 2009 10:07:27 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Frederic Weisbecker <fweisbec@...il.com>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] power: fix a build breakage on latest -tip


* Frederic Weisbecker <fweisbec@...il.com> wrote:

> A recent conflict resolve (c2eefa20c3ab45ab2108ce7e6561364ea92d7334)
> did put twice the function suspend_test() on kernel/power/main.c
> 
> The version added for CONFIG_PM_TEST_SUSPEND to solve the conflict overlaps
> the one changed recently on (091d71e023557136e96f0e54f301497a3fc95dc3)
> since PM_TEST_SUSPEND depends on SUSPEND.
> 
> Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>

This conflict existed for about 10 minutes until automation caught it :)
Latest tip/master is fine, right?

	Ingo
--
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/