Hi! > > Many thanks for taking care of this! > > > > We already have a patch in -mm, s2ram-kill-old-debugging-junk.patch from > > Pavel > > (http://marc.info/?l=linux-mm-commits&m=118737955611331&w=1), that removes > > the > > #ifdefed blocks and it clashes with your first patch a bit. > > > > FYI, I have rebased your first patch on top of the Pavel's patch: > > http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.23-rc6/patches/39-acpi-video-mode-fix.patch > > > > Thanks Rafael, > > However, I need to send something upstream to Linus for this kernel > cycle, so I don't want to base it on an -mm patch. There are two > alternatives, obviously: 1. send my patch in now based on the "change as > little as necessary to fix the immediate problem" and then rebase > Pavel's patch on top of mine, or 2. for me to send both Pavel's patch > and the rebased patch upstream. > > Personally, I would prefer to avoid strategy 2 at this late stage in the > 2.6.23-rc series.
Agreed we should have the fix in 2.6.23... Actually doing 2 does not seem like a big problem, my patch is pretty straight cleanup (and may even fix some machines, as we avoid touching video ram)... But resolving conflict is not hard, either; I know, I did it :-). Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/