Messages in this thread | | | Date | Thu, 24 Dec 2009 15:05:06 -0500 (EST) | From | Len Brown <> | Subject | Re: linux-next: manual merge of the acpi tree with Linus' tree |
| |
> > Simpler to just drop the offending patch: > > > > a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c > > sony-laptop: remove private workqueue, use keventd instead > > > > and get a properly refreshed version of that from Dmitry/Mattia later. > > Yep, that would work, thanks.
FYI, I dropped that patch yesterday, and then just now included a refreshed patch from Dmitry. So linux-next should be conflict free now.
thanks, Len Brown, Intel Open Source Technology Center
| |