From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
"Michael S. Tsirkin" <mst@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Hildenbrand <david@redhat.com>,
Alexander Duyck <alexander.h.duyck@linux.intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the vhost tree
Date: Tue, 10 Mar 2020 19:02:05 +1100 [thread overview]
Message-ID: <20200310190205.7c152ef9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/virtio/virtio_balloon.c
between commit:
b5769cdc14fc ("virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")
from the vhost tree and commits:
b64c4d5bea98 ("virtio-balloon: pull page poisoning config out of free page hinting")
80c03575431c ("virtio-balloon: add support for providing free page reports to host")
from the akpm-current tree.
I looked at the conflict for a while but could not easily see how to
reconcile it, so I decided to revert the vhost tree commit for today.
Some advice would be appreciated.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-10 8:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 8:02 Stephen Rothwell [this message]
2020-03-10 8:39 ` linux-next: manual merge of the akpm-current tree with the vhost tree David Hildenbrand
2020-03-10 9:04 ` Michael S. Tsirkin
2020-03-10 9:06 ` David Hildenbrand
-- strict thread matches above, loose matches on Subject: below --
2020-03-30 8:31 Stephen Rothwell
2020-04-07 3:25 ` Stephen Rothwell
2020-04-07 9:54 ` Michael S. Tsirkin
2016-01-08 5:59 Stephen Rothwell
2016-01-08 6:46 ` Michael S. Tsirkin
2016-01-08 6:50 ` Stephen Rothwell
2016-01-08 7:05 ` Michael S. Tsirkin
2016-01-08 7:19 ` Stephen Rothwell
2016-01-08 7:17 ` Minchan Kim
2016-01-08 7:38 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200310190205.7c152ef9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@linux.intel.com \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.