RE: [char-misc-next 2/2] mei: drop RECOVERING_FROM_RESET devicestate
From: Winkler, Tomas
Date: Tue Mar 26 2013 - 18:47:52 EST
>
> 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&