From: "Carlos R. Mafra" <crmafra2@gmail.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-kernel@vger.kernel.org, tomas.winkler@intel.com,
kernel@nn7.de, linux-wireless@vger.kernel.org
Subject: Re: Suspend to RAM regression in 2.6.28-rc2 (bisected)
Date: Mon, 27 Oct 2008 18:57:19 +0100 [thread overview]
Message-ID: <20081027175719.GA5759@localhost.aei.mpg.de> (raw)
In-Reply-To: <200810271839.39236.rjw@sisk.pl>
On Mon 27.Oct'08 at 18:39:38 +0100, Rafael J. Wysocki wrote:
> On Monday, 27 of October 2008, Carlos R. Mafra wrote:
> > Hi,
> >
> > So I managed to bisect my suspend to RAM regression in 2.6.27-rc2
> > to commit 3b7ee69d0caefbdb85a606a98bff841b8c63b97e ("mac80211: disassociate
> > when moving to new BSS") by Tomas Winkler (Cc:-ed).
> >
> > Unfortunately it doesn't revert cleanly so I can't double check it.
>
> Why are you saying it doesn't revert cleanly? For me it does revert without
> rejects from 2.6.28-rc2.
I get this
[mafra@localhost:linux-2.6]$ git checkout v2.6.28-rc2 -b s2ram
Switched to a new branch "s2ram"
[mafra@localhost:linux-2.6]$ git revert 3b7ee69d
warning: too many files, skipping inexact rename detection
Auto-merged net/mac80211/mlme.c
CONFLICT (content): Merge conflict in net/mac80211/mlme.c
Automatic revert failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
I don't know what is happening here :-(
next prev parent reply other threads:[~2008-10-27 18:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20081027162054.GA4015@localhost.aei.mpg.de>
2008-10-27 17:32 ` Suspend to RAM regression in 2.6.28-rc2 (bisected) Rafael J. Wysocki
2008-10-27 18:07 ` Soeren Sonnenburg
2008-10-27 18:31 ` Johannes Berg
2008-10-27 18:44 ` Johannes Berg
2008-10-27 19:00 ` Carlos R. Mafra
2008-10-27 19:03 ` Johannes Berg
2008-10-27 19:11 ` Carlos R. Mafra
2008-10-27 19:13 ` Johannes Berg
2008-10-27 20:39 ` Carlos R. Mafra
2008-10-27 20:51 ` Rafael J. Wysocki
2008-10-27 20:52 ` Carlos R. Mafra
2008-10-27 21:07 ` Rafael J. Wysocki
2008-10-27 22:05 ` Carlos R. Mafra
2008-10-27 21:07 ` Tomas Winkler
2008-10-27 22:28 ` Carlos R. Mafra
2008-10-27 22:40 ` Tomas Winkler
2008-10-27 22:50 ` Rafael J. Wysocki
2008-10-27 23:12 ` Tomas Winkler
2008-10-27 23:23 ` Harvey Harrison
2008-10-28 15:30 ` Rafael J. Wysocki
2008-10-28 16:12 ` Tomas Winkler
2008-10-28 6:32 ` Christian Borntraeger
2008-10-27 19:06 ` Jens Axboe
2008-10-27 19:09 ` Johannes Berg
2008-10-27 19:13 ` Jens Axboe
2008-10-27 19:16 ` Johannes Berg
2008-10-27 19:20 ` Jens Axboe
[not found] ` <200810271839.39236.rjw@sisk.pl>
2008-10-27 17:57 ` Carlos R. Mafra [this message]
2008-10-27 18:00 ` John W. Linville
2008-10-27 18:16 ` Rafael J. Wysocki
2008-10-27 18:36 ` Carlos R. Mafra
2008-10-27 18:51 ` Carlos R. Mafra
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=20081027175719.GA5759@localhost.aei.mpg.de \
--to=crmafra2@gmail.com \
--cc=kernel@nn7.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=tomas.winkler@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).