From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the suspend tree with the input tree
Date: Thu, 7 Jan 2010 21:45:32 +0100 [thread overview]
Message-ID: <201001072145.32332.rjw@sisk.pl> (raw)
In-Reply-To: <20100107043040.GB2314@core.coreip.homeip.net>
On Thursday 07 January 2010, Dmitry Torokhov wrote:
> On Thu, Jan 07, 2010 at 03:07:23PM +1100, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the suspend tree got a conflict in
> > drivers/input/serio/serio.c between commits
> > 386d8772980be01b94bd463ea1e745732d7eb502 ("Input: serio - use device core
> > to create 'id' attribute group") and
> > ddf1ffbd40c92ff1e58c45fa96d309788f7beb60 ("Input: serio - let device core
> > tell us if device was registered") from the input tree and commit
> > f543d6795ccfbd443a042e012a6aea15e4f4c87a ("PM: Allow serio input devices
> > to suspend/resume asynchronously") from the suspend tree.
> >
> > I fixed it up (see below) but am not sure it this is the correct fix. I
> > can carry this fix as necessary.
>
> I think the fix is fine, however, do we still need to do async serio
> suspend, now that we sped up resetting psmouse and atkbd? Rafael?
Well, serio suspend is about 30 ms total on my test boxes that may be
reduced to 15 ms by async. Not much, but still.
Please let me know what you think.
Rafael
prev parent reply other threads:[~2010-01-07 20:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 4:07 linux-next: manual merge of the suspend tree with the input tree Stephen Rothwell
2010-01-07 4:30 ` Dmitry Torokhov
2010-01-07 20:45 ` Rafael J. Wysocki [this message]
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=201001072145.32332.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).