[lkml]   [2018]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the xarray tree with the f2fs tree
Hi all,

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


between commit:

bab475c5414e ("Revert: "f2fs: check last page index in cached bio to decide submission"")

from the f2fs tree and commit:

dfe989c12c50 ("pagevec: Use xa_mark_t")

from the xarray 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.

Stephen Rothwell

diff --cc fs/f2fs/data.c
index 9ef6f1f01eda,6962491172a5..000000000000
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -2029,10 -2000,10 +2029,10 @@@ static int f2fs_write_cache_pages(struc
pgoff_t index;
pgoff_t end; /* Inclusive */
pgoff_t done_index;
- pgoff_t last_idx = ULONG_MAX;
int cycled;
int range_whole = 0;
- int tag;
+ xa_mark_t tag;
+ int nwritten = 0;


[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-10-03 10:18    [W:0.031 / U:0.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site