public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
* Re: FAILED: patch "[PATCH] Revert "btrfs: compression: don't try to compress if we don't" failed to apply to 5.4-stable tree
       [not found] <16302200512317@kroah.com>
@ 2021-08-30 13:09 ` David Sterba
  2021-09-01  8:18   ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: David Sterba @ 2021-08-30 13:09 UTC (permalink / raw)
  To: gregkh; +Cc: wqu, ce3g8jdj, dsterba, stable, linux-btrfs

On Sun, Aug 29, 2021 at 08:54:11AM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 5.4-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.

The code in versions from 5.4 to 4.4 is the same and the merge conflict
can be resolved from that (eg. from file
stable.git/releases/./5.4.136/btrfs-compression-don-t-try-to-compress-if-we-don-t-have-enough-pages.patch)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: FAILED: patch "[PATCH] Revert "btrfs: compression: don't try to compress if we don't" failed to apply to 5.4-stable tree
  2021-08-30 13:09 ` FAILED: patch "[PATCH] Revert "btrfs: compression: don't try to compress if we don't" failed to apply to 5.4-stable tree David Sterba
@ 2021-09-01  8:18   ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2021-09-01  8:18 UTC (permalink / raw)
  To: dsterba, wqu, ce3g8jdj, dsterba, stable, linux-btrfs

On Mon, Aug 30, 2021 at 03:09:49PM +0200, David Sterba wrote:
> On Sun, Aug 29, 2021 at 08:54:11AM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.4-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> 
> The code in versions from 5.4 to 4.4 is the same and the merge conflict
> can be resolved from that (eg. from file
> stable.git/releases/./5.4.136/btrfs-compression-don-t-try-to-compress-if-we-don-t-have-enough-pages.patch)

I'm sorry, but I do not understand what you are trying to say here.
What exactly should I do?

confused,

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-01  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <16302200512317@kroah.com>
2021-08-30 13:09 ` FAILED: patch "[PATCH] Revert "btrfs: compression: don't try to compress if we don't" failed to apply to 5.4-stable tree David Sterba
2021-09-01  8:18   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox