Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 31 May 2020 13:34:48 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     "Michael S. Tsirkin" <mst@redhat.com>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.6 086/126] virtio-balloon: Revert "virtio-balloon:
 Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
Message-ID: <20200531113448.GB1237439@kroah.com>
References: <20200526183937.471379031@linuxfoundation.org>
 <20200526183945.237904570@linuxfoundation.org>
 <20200531051724-mutt-send-email-mst@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200531051724-mutt-send-email-mst@kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, May 31, 2020 at 05:18:06AM -0400, Michael S. Tsirkin wrote:
> On Tue, May 26, 2020 at 08:53:43PM +0200, 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.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > Signed-off-by: Sasha Levin <sashal@kernel.org>
> 
> I don't understand. How does this make sense in stable?
> stable does not merge akpm does it?

It does not make sense, and is queued up to be reverted in the next
release.

thanks,

greg k-h