From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
"Michael S. Tsirkin" <mst@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Minchan Kim <minchan@kernel•org>
Subject: linux-next: manual merge of the akpm-current tree with the vhost tree
Date: Fri, 8 Jan 2016 16:59:08 +1100 [thread overview]
Message-ID: <20160108165908.2da89bfd@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/balloon_compaction.c
between commit:
0b5ffdb4f7c6 ("balloon: fix page list locking")
from the vhost tree and commit:
0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
from the akpm-current tree.
I fixed it up (I think that the former is a superset of the latter, so
I used that, completely reversing the latter patch) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2016-01-08 5:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 5:59 Stephen Rothwell [this message]
2016-01-08 6:46 ` linux-next: manual merge of the akpm-current tree with the vhost tree 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
-- strict thread matches above, loose matches on Subject: below --
2020-03-10 8:02 Stephen Rothwell
2020-03-10 8:39 ` David Hildenbrand
2020-03-10 9:04 ` Michael S. Tsirkin
2020-03-10 9:06 ` David Hildenbrand
2020-03-30 8:31 Stephen Rothwell
2020-04-07 3:25 ` Stephen Rothwell
2020-04-07 9:54 ` 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=20160108165908.2da89bfd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=minchan@kernel$(echo .)org \
--cc=mst@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox