Messages in this thread | | | Date | Mon, 9 Feb 2009 14:35:37 +0100 | From | Frederic Weisbecker <> | Subject | Re: [PATCH] power: fix a build breakage on latest -tip |
| |
On Mon, Feb 09, 2009 at 10:07:27AM +0100, Ingo Molnar wrote: > > * Frederic Weisbecker <fweisbec@gmail.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@gmail.com> > > This conflict existed for about 10 minutes until automation caught it :) > Latest tip/master is fine, right?
Right! Nobody's faster than -tip testing ;-)
> Ingo
| |