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

From: Stephen Rothwell
Date: Mon Jul 29 2013 - 01:01:46 EST

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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;

Attachment: pgp00000.pgp
Description: PGP signature