Re: [char-misc-next 2/2] mei: drop RECOVERING_FROM_RESET device state

[Greg KH <gregkh@linuxfoundation.org>]

On Tue, Mar 26, 2013 at 10:47:31PM +0000, Winkler, Tomas wrote:
> > 
> > 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.  

Yes, I hope to get it there.

> 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.

Let me know about such conflicts so I don't blame you for them :)

I'll pull in the char-misc.linus branch into my .next branch now, so
that should solve this problem, right?  If so, please resend this patch
so I can apply it.

thanks,

greg k-h