Re: [PATCH 1/2] fs: Convert writepage_t callback to pass a folio

[Andrew Morton <akpm@linux-foundation.org>]

On Sun, 29 Jan 2023 01:13:56 +0800 kernel test robot <lkp@intel.com> wrote:

> Hi Matthew,
> 
> I love your patch! Yet something to improve:
> 
> [auto build test ERROR on next-20230125]
> [cannot apply to tytso-ext4/dev akpm-mm/mm-everything cifs/for-next mszeredi-fuse/for-next xfs-linux/for-next trondmy-nfs/linux-next hubcap/for-next linus/master v6.2-rc5 v6.2-rc4 v6.2-rc3 v6.2-rc5]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
> 
> url:    https://github.com/intel-lab-lkp/linux/commits/Matthew-Wilcox-Oracle/fs-Convert-writepage_t-callback-to-pass-a-folio/20230128-112951
> patch link:    https://lore.kernel.org/r/20230126201255.1681189-2-willy%40infradead.org
> patch subject: [PATCH 1/2] fs: Convert writepage_t callback to pass a folio
> config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20230129/202301290130.frg9YGk5-lkp@intel.com/config)
> compiler: s390-linux-gcc (GCC) 12.1.0
> reproduce (this is a W=1 build):
>         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # https://github.com/intel-lab-lkp/linux/commit/19e834de445f5d3a390fff94320e71e8077ce632
>         git remote add linux-review https://github.com/intel-lab-lkp/linux
>         git fetch --no-tags linux-review Matthew-Wilcox-Oracle/fs-Convert-writepage_t-callback-to-pass-a-folio/20230128-112951
>         git checkout 19e834de445f5d3a390fff94320e71e8077ce632
>         # save the config file
>         mkdir build_dir && cp config build_dir/.config
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=s390 olddefconfig
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash fs/gfs2/
> 
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>    fs/gfs2/log.c: In function 'gfs2_ail1_start_one':
> >> fs/gfs2/log.c:143:55: error: passing argument 3 of 'write_cache_pages' from incompatible pointer type [-Werror=incompatible-pointer-types]
>      143 |                 ret = write_cache_pages(mapping, wbc, __gfs2_writepage, mapping);
>          |                                                       ^~~~~~~~~~~~~~~~

Thanks.  This is due to a conflict with a recent upstream merge from
the GFS tree.  Stephen addressed this in linux-next:

https://lkml.kernel.org/r/20230127173638.1efbe423@canb.auug.org.au

a) I could rebase mm.git onto -rc5 or later.

b) Or I could disable Matthew's patches until late merge window,
   after I resync with mainline for stragglers such as this.

c) Or I could do nothing - things will get sorted out once Matthew's
   commits hit mainline during the regular merge.

Perhaps a)?  People don't want to have to deal with conflicts when
merging current mm.git onto current mainline.