Subject: linux-next: manual merge of the mm-stable tree with the cifs tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 20 Feb 2023 15:29:33 +1100

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  fs/cifs/file.c

between commit:

  c8859bc0c129 ("cifs: Remove unused code")

from the cifs tree and commits:

  4cda80f3a7a5 ("cifs: convert wdata_alloc_and_fillpages() to use filemap_get_folios_tag()")
  d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")

from the mm-stable tree.

This is a real mess :-(

I have no idea how to fix this up, so I have used the cifs tree from
next-20230217 for today.

-- 
Cheers,
Stephen Rothwell