lkml.org 
[lkml]   [2020]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5.6 086/126] virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
On Thu, May 28, 2020 at 07:11:17AM -0400, Sasha Levin wrote:
> On Thu, May 28, 2020 at 10:21:41AM +0200, David Hildenbrand wrote:
> > On 28.05.20 07:51, Jiri Slaby wrote:
> > > On 26. 05. 20, 20:53, Greg Kroah-Hartman wrote:
> > > > From: Michael S. Tsirkin <mst@redhat.com>
> > > >
> > > > [ Upstream commit 835a6a649d0dd1b1f46759eb60fff2f63ed253a7 ]
> > > >
> > > > This reverts commit 5a6b4cc5b7a1892a8d7f63d6cbac6e0ae2a9d031.
> > > >
> > > > It has been queued properly in the akpm tree, this version is just
> > > > creating conflicts.
> > >
> > > Should this be applied to stable trees at all?
> > >
> > > To me, it occurs to be a revert to avoid conflicts, not to fix something?
> >
> > Agreed.
>
> Right, I'll drop it - thank you.

Already committed, I'll go revert this now, thanks.

greg k-h

\
 
 \ /
  Last update: 2020-05-28 13:24    [W:0.083 / U:7.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site