Jaegeuk Kim ca504a6c00 Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable
This series addressed merge conflicts based on pa/c/1664425/15, mainly
integrated with a patch "f2fs: Handle casefolding with Encryption" for
casefolding support in ACK only.

* aosp/upstream-f2fs-stable-linux-4.14.y:
  f2fs: flush dirty meta pages when flushing them
  f2fs: fix checkpoint=disable:%u%%
  f2fs: rework filename handling
  f2fs: split f2fs_d_compare() from f2fs_match_name()
  f2fs: don't leak filename in f2fs_try_convert_inline_dir()
  Revert "f2fs: refactor resize_fs to avoid meta updates in progress"
  f2fs: fix missing check for f2fs_unlock_op
  f2fs: refactor resize_fs to avoid meta updates in progress

Conflicts:
	fs/f2fs/dir.c
	fs/f2fs/f2fs.h
	fs/f2fs/hash.c
	fs/f2fs/inline.c
	fs/f2fs/namei.c

Change-Id: Ib5ceb0f2f076d6c215d4c0c6262f3c1d41cde7c8
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2020-05-27 13:43:59 -07:00
..
2019-10-11 19:06:20 +02:00
2020-04-03 08:18:27 +02:00
2020-05-06 09:01:56 +02:00
2020-05-03 08:51:19 +02:00
2019-08-06 19:05:23 +02:00
2019-12-17 20:38:33 +01:00
2019-12-05 15:48:19 +01:00
2019-12-17 21:13:36 +01:00
2020-04-24 08:41:10 +02:00
2019-12-17 21:13:36 +01:00
2020-05-06 09:01:56 +02:00
2020-04-24 08:41:10 +02:00
2020-05-03 08:51:19 +02:00
2020-02-13 15:17:48 -08:00
2018-12-21 14:13:04 +01:00
2020-04-24 08:41:10 +02:00
2020-05-20 12:15:34 +02:00
2020-03-11 18:02:43 +01:00
2020-05-20 12:15:34 +02:00
2020-04-03 08:18:27 +02:00
2020-04-03 08:18:27 +02:00
2020-03-11 19:30:15 +01:00
2020-03-20 12:19:46 +01:00
2020-05-03 08:51:19 +02:00
2018-02-22 19:18:40 +00:00