From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Oct 2020 18:33:41 +0000 (-0700)
Subject: Merge tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v5.15~2591
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4728cfbed0f54eacc21138c99da2a91895c8c5a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfs-5.10-merge-1' of git://git./fs/xfs/xfs-linux

Pull clone/dedupe/remap code refactoring from Darrick Wong:
 "Move the generic file range remap (aka reflink and dedupe) functions
  out of mm/filemap.c and fs/read_write.c and into fs/remap_range.c to
  reduce clutter in the first two files"

* tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  vfs: move the generic write and copy checks out of mm
  vfs: move the remap range helpers to remap_range.c
  vfs: move generic_remap_checks out of mm
---

c4728cfbed0f54eacc21138c99da2a91895c8c5a
diff --cc fs/Makefile
index 7bb2a05fda1f,7173350739c5..999d1a23f036
--- 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