lkml.org 
[lkml]   [2008]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: Suspend to RAM regression in 2.6.28-rc2 (bisected)
Date
On Monday, 27 of October 2008, Carlos R. Mafra wrote:
> 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 :-(

If you have quilt installed, you can do:

$ git show 3b7ee69d > suspicious.patch
$ quilt import -R suspicious.patch
$ quilt push

(that should work without rejects) and build the kernel.

Thanks,
Rafael


\
 
 \ /
  Last update: 2008-10-27 19:15    [W:0.047 / U:1.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site