* [PATCH] power: fix a build breakage on latest -tip
@ 2009-02-08 23:58 Frederic Weisbecker
2009-02-09 9:07 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Frederic Weisbecker @ 2009-02-08 23:58 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel
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>
---
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 2ade836..2265b98 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -135,16 +135,6 @@ static int suspend_test(int level)
#ifdef CONFIG_PM_TEST_SUSPEND
-static int suspend_test(int level)
-{
- if (pm_test_level == level) {
- printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
- mdelay(5000);
- return 1;
- }
- return 0;
-}
-
/*
* We test the system suspend code by setting an RTC wakealarm a short
* time in the future, then suspending. Suspending the devices won't
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] power: fix a build breakage on latest -tip
2009-02-08 23:58 [PATCH] power: fix a build breakage on latest -tip Frederic Weisbecker
@ 2009-02-09 9:07 ` Ingo Molnar
2009-02-09 13:35 ` Frederic Weisbecker
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2009-02-09 9:07 UTC (permalink / raw)
To: Frederic Weisbecker; +Cc: linux-kernel
* 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?
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] power: fix a build breakage on latest -tip
2009-02-09 9:07 ` Ingo Molnar
@ 2009-02-09 13:35 ` Frederic Weisbecker
0 siblings, 0 replies; 3+ messages in thread
From: Frederic Weisbecker @ 2009-02-09 13:35 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-09 13:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-08 23:58 [PATCH] power: fix a build breakage on latest -tip Frederic Weisbecker
2009-02-09 9:07 ` Ingo Molnar
2009-02-09 13:35 ` Frederic Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox