From: Dmitry Torokhov <dmitry.torokhov@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@sisk•pl>,
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: Wed, 6 Jan 2010 20:30:40 -0800 [thread overview]
Message-ID: <20100107043040.GB2314@core.coreip.homeip.net> (raw)
In-Reply-To: <20100107150723.b07d521b.sfr@canb.auug.org.au>
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?
--
Dmitry
next prev parent reply other threads:[~2010-01-07 4:30 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 [this message]
2010-01-07 20:45 ` Rafael J. Wysocki
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=20100107043040.GB2314@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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