From: Ingo Molnar <mingo@elte.hu>
To: Frederic Weisbecker <fweisbec@gmail.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] power: fix a build breakage on latest -tip
Date: Mon, 9 Feb 2009 10:07:27 +0100 [thread overview]
Message-ID: <20090209090727.GD31890@elte.hu> (raw)
In-Reply-To: <20090208235838.GA4729@nowhere>
* 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
next prev parent reply other threads:[~2009-02-09 9:07 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 [this message]
2009-02-09 13:35 ` Frederic Weisbecker
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=20090209090727.GD31890@elte.hu \
--to=mingo@elte.hu \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.