Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1304200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the akpm-current tree with the vhost tree |
| Date | 2016-01-08 07:00 +0100 |
| Message-ID | <qOyfE-2im-3@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 07:00 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 07:50 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:00 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:10 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:30 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Minchan Kim <minchan@kernel.org> - 2016-01-08 08:20 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:40 +0100
csiph-web