linux-next: build failure after merge of the block tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the block tree, today's linux-next build (or32
or1ksim_defconfig) failed like this:

mm/page-writeback.c:2044:6: error: redefinition of 'laptop_sync_completion'
 2044 | void laptop_sync_completion(void)
      |      ^~~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:9,
                 from mm/page-writeback.c:20:
include/linux/writeback.h:345:20: note: previous definition of 'laptop_sync_completion' was here
  345 | static inline void laptop_sync_completion(void) { }
      |                    ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  5ed964f8e54e ("mm: hide laptop_mode_wb_timer entirely behind the BDI API")

This build does not have CONFIG_BLOCK set.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpLwAvBpLsOm.pgp
Description: OpenPGP digital signature