RE: [char-misc-next 2/2] mei: drop RECOVERING_FROM_RESET devicestate

[Winkler, Tomas]

> 
> On Sun, Mar 17, 2013 at 11:41:21AM +0200, Tomas Winkler wrote:
> > ECOVERING_FROM_RESET device state is never set we can remove it
> 
> Really?  I now get the following build error with this patch applied:
> 
> drivers/misc/mei/pci-me.c: In function âmei_pci_suspendâ:
> drivers/misc/mei/pci-me.c:323:24: error:
> âMEI_DEV_RECOVERING_FROM_RESETâ undeclared (first use in this
> function)
> drivers/misc/mei/pci-me.c:323:24: note: each undeclared identifier is
> reported only once for each function it appears in
> 
> Please be more careful.

This patch has to be applied above patch  https://lkml.org/lkml/2013/3/10/101 that is queued for 3.9. 
Somehow I've assumed it will go into 3.9-rc4.  
Anyhow we need to wait with this and everything else I have queued till it is merged back to char-misc-next.
Maybe you have some suggestions how to handle such conflicts in the future.

Thanks
Tomas
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðÃnÆàþY&—