linux-kernel - RE: [char-misc-next 2/2] mei: drop RECOVERING_FROM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B01EF3427@HASMSX106.ger.corp.intel.com>
Date:	Tue, 26 Mar 2013 22:47:31 +0000
From:	"Winkler, Tomas" <tomas.winkler@...el.com>
To:	Greg KH <gregkh@...uxfoundation.org>
CC:	"arnd@...db.de" <arnd@...db.de>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [char-misc-next 2/2] mei: drop RECOVERING_FROM_RESET device
 state

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