From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Pavel Machek <pavel@ucw.cz>, "H. Peter Anvin" <hpa@zytor.com>
Cc: Jeff Chua <jeff.chua.linux@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: ACPI video mode patch review
Date: Mon, 17 Sep 2007 00:04:05 +0200 [thread overview]
Message-ID: <200709170004.06095.rjw@sisk.pl> (raw)
In-Reply-To: <20070916205922.GI11983@elf.ucw.cz>
On Sunday, 16 September 2007 22:59, Pavel Machek wrote:
> 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 :-).
OK, let's take path 1, then.
Greetings,
Rafael
next prev parent reply other threads:[~2007-09-16 21:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-13 21:37 ACPI video mode patch review H. Peter Anvin
2007-09-13 23:23 ` Jeff Chua
2007-09-14 9:25 ` Pavel Machek
2007-09-16 20:08 ` Rafael J. Wysocki
2007-09-16 20:53 ` H. Peter Anvin
2007-09-16 20:59 ` Pavel Machek
2007-09-16 22:04 ` Rafael J. Wysocki [this message]
2007-09-20 14:19 ` Jiri Kosina
2007-09-20 14:22 ` Jeff Chua
2007-09-20 14:37 ` Jiri Kosina
2007-09-20 14:51 ` Jeff Chua
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=200709170004.06095.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=hpa@zytor.com \
--cc=jeff.chua.linux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/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.