linux-next: manual merge of the fs-next tree with the mm-fixes tree

linux-next: manual merge of the fs-next tree with the mm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

Hi all,

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

  mm/filemap.c

between commit:

  0ff9a4200192d ("mm: limit pagecache folio refcount when splicing into pipes")

from the mm-fixes tree and commit:

  028bbac710376 ("fs: annotate lockless file position updates in sendfile")

from the fs-next 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.

diff --cc mm/filemap.c
index d96ea2c9db285,c9bc0fdf15ad4..0000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -3183,8 -3175,9 +3183,9 @@@ ssize_t filemap_splice_read(struct fil
  			len -= n;
  			total_spliced += n;
  			*ppos += n;
- 			in->f_ra.prev_pos = *ppos;
+ 			/* readahead hint, racy updates are benign */
+ 			data_race(in->f_ra.prev_pos = *ppos);
 -			if (pipe_is_full(pipe))
 +			if (pipe_is_full(pipe) || *ppos < folio_next_pos(folio))
  				goto out;
  		}
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]