linux-kernel - linux-next: manual merge of the char-misc tree with Linus' tree

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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 29 Jul 2013 15:01:29 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tomas Winkler <tomas.winkler@...el.com>
Subject: linux-next: manual merge of the char-misc tree with Linus' tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/mei/init.c between commit 99f22c4ef24c ("mei: don't have to
clean the state on power up") from Linus' tree and commit b950ac1dabfc
("mei: don't get stuck in select during reset") from the char-misc tree.

(Unrelated white space changes are a pest :-()

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/misc/mei/init.c
index e6f16f8,557eed2..0000000
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@@ -148,8 -148,8 +148,9 @@@ void mei_reset(struct mei_device *dev, 
  
  	dev->hbm_state = MEI_HBM_IDLE;
  
 -	if (dev->dev_state != MEI_DEV_INITIALIZING) {
 +	if (dev->dev_state != MEI_DEV_INITIALIZING &&
 +	    dev->dev_state != MEI_DEV_POWER_UP) {
+ 
  		if (dev->dev_state != MEI_DEV_DISABLED &&
  		    dev->dev_state != MEI_DEV_POWER_DOWN)
  			dev->dev_state = MEI_DEV_RESETTING;

Content of type "application/pgp-signature" skipped