linux-next: manual merge of the akpm-current tree with thechar-misc tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/misc/mei/hbm.c between commit 544f94601409 ("mei: do not run
reset flow from the interrupt thread") from the char-misc tree and commit
dd045dab2999 ("drivers/misc/mei: ratelimit several error messages") from
the akpm-current tree.

I am not sure if the akpm-current tree fix is still needed, but I fixed
it up anyway (see below) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/misc/mei/hbm.c
index 8520cdfa2f05,2ab8b1dab39c..000000000000
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@@ -626,31 -597,25 +626,31 @@@ int mei_hbm_dispatch(struct mei_device 
  		}
  
  		if (!mei_hbm_version_is_supported(dev)) {
 -			dev_warn(&dev->pdev->dev, "hbm version mismatch: stopping the driver.\n");
 +			dev_warn(&dev->pdev->dev, "hbm: start: version mismatch - stopping the driver.\n");
  
 -			dev->hbm_state = MEI_HBM_STOP;
 +			dev->hbm_state = MEI_HBM_STOPPED;
  			mei_hbm_stop_req_prepare(dev, &dev->wr_msg.hdr,
  						dev->wr_msg.data);
 -			mei_write_message(dev, &dev->wr_msg.hdr,
 -					dev->wr_msg.data);
 +			if (mei_write_message(dev, &dev->wr_msg.hdr,
 +					dev->wr_msg.data)) {
 +				dev_err(&dev->pdev->dev, "hbm: start: failed to send stop request\n");
 +				return -EIO;
 +			}
 +			break;
 +		}
  
 -			return;
 +		if (dev->dev_state != MEI_DEV_INIT_CLIENTS ||
 +		    dev->hbm_state != MEI_HBM_START) {
- 			dev_err(&dev->pdev->dev, "hbm: start: state mismatch, [%d, %d]\n",
++			dev_err_ratelimited(&dev->pdev->dev, "hbm: start: state mismatch, [%d, %d]\n",
 +				dev->dev_state, dev->hbm_state);
 +			return -EPROTO;
  		}
  
 -		if (dev->dev_state == MEI_DEV_INIT_CLIENTS &&
 -		    dev->hbm_state == MEI_HBM_START) {
 -			dev->init_clients_timer = 0;
 -			mei_hbm_enum_clients_req(dev);
 -		} else {
 -			dev_err_ratelimited(&dev->pdev->dev, "reset: wrong host start response\n");
 -			mei_reset(dev, 1);
 -			return;
 +		dev->hbm_state = MEI_HBM_STARTED;
 +
 +		if (mei_hbm_enum_clients_req(dev)) {
 +			dev_err(&dev->pdev->dev, "hbm: start: failed to send enumeration request\n");
 +			return -EIO;
  		}
  
  		wake_up_interruptible(&dev->wait_recvd_msg);
@@@ -731,25 -681,19 +731,25 @@@
  				< sizeof(enum_res->valid_addresses));
  		memcpy(dev->me_clients_map, enum_res->valid_addresses,
  			sizeof(enum_res->valid_addresses));
 -		if (dev->dev_state == MEI_DEV_INIT_CLIENTS &&
 -		    dev->hbm_state == MEI_HBM_ENUM_CLIENTS) {
 -				dev->init_clients_timer = 0;
 -				mei_hbm_me_cl_allocate(dev);
 -				dev->hbm_state = MEI_HBM_CLIENT_PROPERTIES;
 -
 -				/* first property reqeust */
 -				mei_hbm_prop_req(dev);
 -		} else {
 -			dev_err_ratelimited(&dev->pdev->dev, "reset: unexpected enumeration response hbm.\n");
 -			mei_reset(dev, 1);
 -			return;
 +
 +		if (dev->dev_state != MEI_DEV_INIT_CLIENTS ||
 +		    dev->hbm_state != MEI_HBM_ENUM_CLIENTS) {
- 			dev_err(&dev->pdev->dev, "hbm: enumeration response: state mismatch, [%d, %d]\n",
++			dev_err_ratelimited(&dev->pdev->dev, "hbm: enumeration response: state mismatch, [%d, %d]\n",
 +				dev->dev_state, dev->hbm_state);
 +			return -EPROTO;
 +		}
 +
 +		if (mei_hbm_me_cl_allocate(dev)) {
 +			dev_err(&dev->pdev->dev, "hbm: enumeration response: cannot allocate clients array\n");
 +			return -ENOMEM;
  		}
 +
 +		dev->hbm_state = MEI_HBM_CLIENT_PROPERTIES;
 +
 +		/* first property request */
 +		if (mei_hbm_prop_req(dev))
 +			return -EIO;
 +
  		break;
  
  	case HOST_STOP_RES_CMD:

Attachment: pgp00000.pgp
Description: PGP signature