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

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@xxxxxxxxx> 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@xxxxxxxxx>

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/