Subject: linux-next: manual merge of the djw-vfs tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 16 Oct 2020 11:06:58 +1100

Hi all,

Today's linux-next merge of the djw-vfs tree got a conflict in:

  fs/Makefile

between commit:

  5287b07f6d7c ("fs/kernel_read_file: Split into separate source file")

from Linus' tree and commit:

  02e83f46ebfa ("vfs: move generic_remap_checks out of mm")

from the djw-vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/Makefile
index 7bb2a05fda1f,7173350739c5..000000000000
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -14,7 -14,7 +14,7 @@@ obj-y :=	open.o read_write.o file_table
  		pnode.o splice.o sync.o utimes.o d_path.o \
  		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
  		fs_types.o fs_context.o fs_parser.o fsopen.o init.o \
- 		kernel_read_file.o
 -		remap_range.o
++		kernel_read_file.o remap_range.o
  
  ifeq ($(CONFIG_BLOCK),y)
  obj-y +=	buffer.o block_dev.o direct-io.o mpage.o