From: Frederic Weisbecker <fweisbec@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] power: fix a build breakage on latest -tip
Date: Mon, 9 Feb 2009 14:35:37 +0100 [thread overview]
Message-ID: <20090209133534.GB4705@nowhere> (raw)
In-Reply-To: <20090209090727.GD31890@elte.hu>
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
prev parent reply other threads:[~2009-02-09 13:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090209133534.GB4705@nowhere \
--to=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox