From: David Hildenbrand <david@redhat•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
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, 10 Mar 2020 10:06:02 +0100 [thread overview]
Message-ID: <77969004-66c6-0b1b-32d2-e54069698fa4@redhat.com> (raw)
In-Reply-To: <20200310050017-mutt-send-email-mst@kernel.org>
On 10.03.20 10:04, Michael S. Tsirkin wrote:
> On Tue, Mar 10, 2020 at 09:39:21AM +0100, David Hildenbrand wrote:
>> On 10.03.20 09:02, Stephen Rothwell wrote:
>>> 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.
>>>
>>
>> Yes, the free page reporting features are currently in Andrews tree and
>> most probably won't go via the vhost tree due to the core-mm changes.
>> Ideally, the VIRTIO_BALLOON_F_DEFLATE_ON_OOM fix would go in unchanged,
>> because some people might be interested in backporting it (it's not a
>> stable fix, though).
>>
>> I think rebasing any way round shouldn't be too hard.
>>
>> @Alex, Michael, what's your thought on this?
>
> I propose rebasing on top of the akpm tree and merging through there.
> David could you do the rebase pls? I'll review and ack.
>
> While there, keeping virtio_balloon_unregister_shrinker and
> virtio_balloon_register_shrinker around might be a good idea to
> minimize backporting pain.
Will do.
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2020-03-10 9:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 8:02 linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell
2020-03-10 8:39 ` David Hildenbrand
2020-03-10 9:04 ` Michael S. Tsirkin
2020-03-10 9:06 ` David Hildenbrand [this message]
-- 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=77969004-66c6-0b1b-32d2-e54069698fa4@redhat.com \
--to=david@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alexander.h.duyck@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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