From: "Michael S. Tsirkin" <mst@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
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: Re: linux-next: manual merge of the akpm-current tree with the vhost tree
Date: Tue, 7 Apr 2020 05:54:49 -0400 [thread overview]
Message-ID: <20200407055243-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20200407132521.656db6fa@canb.auug.org.au>
On Tue, Apr 07, 2020 at 01:25:21PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 30 Mar 2020 19:31:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > drivers/virtio/virtio_balloon.c
> >
> > between commit:
> >
> > 5a6b4cc5b7a1 ("virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")
> >
> > from the vhost tree and commits:
> >
> > 5193acb63eef ("virtio-balloon: pull page poisoning config out of free page hinting")o
> > 226d0484a676 ("virtio-balloon: add support for providing free page reports to host")
> > 49006aae9e94 ("virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM")
> >
> > from the akpm-current tree.
> >
> > OK, this is such a mess that all I could do was to revert commit
> > 5a6b4cc5b7a1 from the vhost tree and keep all the akpm-current tree
> > patches. Please sort this out before Linus gets to see it.
>
> I am still reverting that commit ...
Oh. Thanks for reminding me. And I sent a pull with this :(
Sorry. I pushed the revert now and sent PULL request v2.
Hope I did it in time ...
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2020-04-07 9:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 8:31 linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell
2020-04-07 3:25 ` Stephen Rothwell
2020-04-07 9:54 ` Michael S. Tsirkin [this message]
-- 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
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=20200407055243-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--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=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 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.