From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753853AbXIPU6s (ORCPT ); Sun, 16 Sep 2007 16:58:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752910AbXIPU6k (ORCPT ); Sun, 16 Sep 2007 16:58:40 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.31.123]:48316 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752625AbXIPU6k (ORCPT ); Sun, 16 Sep 2007 16:58:40 -0400 Date: Sun, 16 Sep 2007 22:59:22 +0200 From: Pavel Machek To: "H. Peter Anvin" Cc: "Rafael J. Wysocki" , Jeff Chua , Linux Kernel Mailing List Subject: Re: ACPI video mode patch review Message-ID: <20070916205922.GI11983@elf.ucw.cz> References: <46E9AD88.7070400@zytor.com> <200709162208.03768.rjw@sisk.pl> <46ED97D0.1090608@zytor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46ED97D0.1090608@zytor.com> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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