From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57175C433E0 for ; Thu, 28 May 2020 11:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 253D7207D3 for ; Thu, 28 May 2020 11:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590665045; bh=PfwCNa8+w0Emv4wzjvTrctgrG8v8Tsq1D9s6BwqQx+A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=mP1mtyeJ3cJ2IcbB+BOuG9BJzmb8vujT3UM3u7hNNpr/4rl1dvAjn6jPogoqTXYE5 3seqzAaNi2CWwtmuvpdWJlNamMIZEaEFTyvA2Fd93TVSaQiqARJa9L+NF5YORUzAT+ Z4IUYXpmACs+n+frvlTW5cYv6IUjH2J+shnArceE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388203AbgE1LYE (ORCPT ); Thu, 28 May 2020 07:24:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:34790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388198AbgE1LYE (ORCPT ); Thu, 28 May 2020 07:24:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 612F6206F1; Thu, 28 May 2020 11:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590665043; bh=PfwCNa8+w0Emv4wzjvTrctgrG8v8Tsq1D9s6BwqQx+A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nn0C0KGpbei/csvP7eVgEIdc2AJaFsHxpUtyg86pI5iv737oQYA7/K/5qhn1HJDLF nMVlwrNfEwOlxUnI18yjND+nwXJltLs/3cww7MLcDcyjNGZNBb4qqarZG3MHiC1zrO B7OdAjuIGFUzhlbJOM1qDrdJBf42R5sQ1096VgIY= Date: Thu, 28 May 2020 13:24:01 +0200 From: Greg Kroah-Hartman To: Sasha Levin Cc: David Hildenbrand , Jiri Slaby , linux-kernel@vger.kernel.org, stable@vger.kernel.org, "Michael S. Tsirkin" 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: <20200528112401.GA3174440@kroah.com> References: <20200526183937.471379031@linuxfoundation.org> <20200526183945.237904570@linuxfoundation.org> <8f649042-bc3a-2809-0332-44a5d3202807@suse.cz> <20200528111117.GK33628@sasha-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200528111117.GK33628@sasha-vm> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 > > > > > > > > [ 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