Messages in this thread | | | Date | Wed, 6 Jan 2010 20:30:40 -0800 | From | Dmitry Torokhov <> | Subject | Re: linux-next: manual merge of the suspend tree with the input tree |
| |
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
| |