From: "Michael S. Tsirkin" <mst@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Minchan Kim <minchan@kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the vhost tree
Date: Fri, 8 Jan 2016 08:46:15 +0200 [thread overview]
Message-ID: <20160108083449-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <20160108165908.2da89bfd@canb.auug.org.au>
On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> 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).
Oops, it isn't.
Andrew, your tree seems to still carry original patch by Minchan Kim:
0c983ec0c078ed5d5c219cf97af06364e7a8e19f
I reported on list that it has a deadlock:
http://article.gmane.org/gmane.linux.kernel.stable/159208
I think it should be reverted and my patch applied - it's in my tree
but if you prefer it in yours instead, please let me know.
Thanks!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
next prev parent reply other threads:[~2016-01-08 6:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 5:59 linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell
2016-01-08 6:46 ` Michael S. Tsirkin [this message]
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
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=20160108083449-mutt-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).