linux-kernel - linux-next: manual merge of the virtio 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Thu, 13 Dec 2012 13:05:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rafael Aquini <aquini@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
Subject: linux-next: manual merge of the virtio tree with Linus' tree

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@...b.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;

Content of type "application/pgp-signature" skipped