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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
drivers/virtio/virtio_balloon.c between commit e22504296d4f
("virtio_balloon: introduce migration primitives to balloon pages") from
Linus' tree and commit 41395dfb3d35 ("virtio: Convert dev_printk
(KERN_<LEVEL> to dev_<level>(") from the virtio tree.

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

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

diff --cc drivers/virtio/virtio_balloon.c
index 2a70558,586395c..0000000
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@@ -133,16 -125,14 +133,15 @@@ static void fill_balloon(struct virtio_
  	/* We can only do one array worth at a time. */
  	num = min(num, ARRAY_SIZE(vb->pfns));
  
 +	mutex_lock(&vb->balloon_lock);
  	for (vb->num_pfns = 0; vb->num_pfns < num;
  	     vb->num_pfns += VIRTIO_BALLOON_PAGES_PER_PAGE) {
 -		struct page *page = alloc_page(GFP_HIGHUSER | __GFP_NORETRY |
 -					__GFP_NOMEMALLOC | __GFP_NOWARN);
 +		struct page *page = balloon_page_enqueue(vb_dev_info);
 +
  		if (!page) {
- 			if (printk_ratelimit())
- 				dev_printk(KERN_INFO, &vb->vdev->dev,
- 					   "Out of puff! Can't get %u pages\n",
- 					   VIRTIO_BALLOON_PAGES_PER_PAGE);
+ 			dev_info_ratelimited(&vb->vdev->dev,
 -					     "Out of puff! Can't get %zu pages\n",
 -					     num);
++					     "Out of puff! Can't get %u pages\n",
++					     VIRTIO_BALLOON_PAGES_PER_PAGE);
  			/* Sleep for at least 1/5 of a second before retry. */
  			msleep(200);
  			break;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 490 bytes --]

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
net/9p/trans_virtio.c between commit 8051a2a518fc ("9p/trans_virtio:
fix hot-unplug") from Linus' tree and commit 1991755689ad
("9p/trans_virtio: fix hot-unplug") from the virtio tree.

I fixed it up (the latter is an older version the former, which is now
in Linus' tree) and can carry the fix as necessary (no action is
required).

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
drivers/scsi/virtio_scsi.c between commit b54197c43db8 ("virtio_scsi:
use cmd_size") from Linus' tree and commit c77fba9ab058 ("virtio_scsi:
don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock") from the
virtio tree.

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

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

diff --cc drivers/scsi/virtio_scsi.c
index d4727b339474,e2a68aece3da..000000000000
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@@ -484,10 -529,13 +483,9 @@@ static int virtscsi_queuecommand(struc
  	memcpy(cmd->req.cmd.cdb, sc->cmnd, sc->cmd_len);
  
  	if (virtscsi_kick_cmd(req_vq, cmd,
- 			      sizeof cmd->req.cmd, sizeof cmd->resp.cmd,
- 			      GFP_ATOMIC) != 0)
 -			      sizeof cmd->req.cmd, sizeof cmd->resp.cmd) == 0)
 -		ret = 0;
 -	else
 -		mempool_free(cmd, virtscsi_cmd_pool);
 -
 -out:
 -	return ret;
++			      sizeof cmd->req.cmd, sizeof cmd->resp.cmd) != 0)
 +		return SCSI_MLQUEUE_HOST_BUSY;
 +	return 0;
  }
  
  static int virtscsi_queuecommand_single(struct Scsi_Host *sh,

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]