android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7bc3e32f7f
android_kernel_asus_sm8350/fs/f2fs
History
Eric Biggers d32db25eea Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 
* aosp/upstream-f2fs-stable-linux-5.4.y:
  fs-verity: remove unnecessary extern keywords
  fs-verity: fix all kerneldoc warnings
  fscrypt: add support for IV_INO_LBLK_32 policies
  fscrypt: make test_dummy_encryption use v2 by default
  fscrypt: support test_dummy_encryption=v2
  fscrypt: add fscrypt_add_test_dummy_key()
  linux/parser.h: add include guards
  fscrypt: remove unnecessary extern keywords
  fscrypt: name all function parameters
  fscrypt: fix all kerneldoc warnings

Conflicts:
	fs/crypto/fscrypt_private.h
	fs/crypto/keyring.c
	fs/crypto/keysetup.c
	fs/ext4/ext4.h
	fs/ext4/super.c
	fs/f2fs/f2fs.h
	fs/f2fs/super.c
	include/linux/fscrypt.h

Resolved the conflicts as per the corresponding android-mainline change,
I7198edbca759839aceeec2598e7a81305756c4d7.

Bug: 154167995
Test: kvm-xfstests -c ext4,f2fs,ext4/encrypt,f2fs/encrypt \
        -g encrypt -g verity -g casefold
      kvm-xfstests -c ext4,f2fs,ext4/encrypt,f2fs/encrypt \
        -g encrypt -g verity -g casefold -m inlinecrypt
Change-Id: Id12839f7948374575f9d15eee6a9c6a9382eacf3
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-06-22 13:32:36 -07:00
..
acl.c f2fs: Replace spaces with tab 2019-05-08 21:23:11 -07:00
acl.h f2fs: Use the correct style for SPDX License Identifier 2020-05-18 13:21:15 -07:00
checkpoint.c f2fs: don't return vmalloc() memory from f2fs_kmalloc() 2020-06-08 20:40:23 -07:00
compress.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-15 13:22:44 -07:00
data.c FROMLIST: f2fs: fix use-after-free when accessing bio->bi_crypt_context 2020-06-22 20:30:51 +00:00
debug.c UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4 (v5.7-rc1) 2020-04-15 03:11:03 +00:00
dir.c f2fs: avoid utf8_strncasecmp() with unstable name 2020-06-08 20:40:23 -07:00
extent_cache.c f2fs: introduce f2fs_<level> macros to wrap f2fs_printk() 2019-07-02 15:40:40 -07:00
f2fs.h Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-22 13:32:36 -07:00
file.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-15 13:22:44 -07:00
gc.c f2fs: add compressed/gc data read IO stat 2020-05-18 13:21:19 -07:00
gc.h f2fs: Use the correct style for SPDX License Identifier 2020-05-18 13:21:15 -07:00
hash.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-05-27 13:35:01 -07:00
inline.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-05-27 13:35:01 -07:00
inode.c UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4 (v5.7-rc1) 2020-04-15 03:11:03 +00:00
Kconfig f2fs: compress: support lzo-rle compress algorithm 2020-05-18 13:21:16 -07:00
Makefile f2fs: support data compression 2020-01-28 10:35:38 -08:00
namei.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-15 13:22:44 -07:00
node.c f2fs: don't return vmalloc() memory from f2fs_kmalloc() 2020-06-08 20:40:23 -07:00
node.h f2fs: shrink spinlock coverage 2020-05-18 13:21:16 -07:00
recovery.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-05-27 13:35:01 -07:00
segment.c f2fs: fix wrong discard space 2020-05-30 08:50:12 -07:00
segment.h f2fs: Use the correct style for SPDX License Identifier 2020-05-18 13:21:15 -07:00
shrinker.c UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4 (v5.7-rc1) 2020-04-15 03:11:03 +00:00
super.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-22 13:32:36 -07:00
sysfs.c Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable 2020-06-22 13:32:36 -07:00
trace.c f2fs: do not use mutex lock in atomic context 2019-03-05 19:58:06 -08:00
trace.h f2fs: Use the correct style for SPDX License Identifier 2020-05-18 13:21:15 -07:00
verity.c fs-verity: implement readahead of Merkle tree pages 2020-02-13 15:02:43 -08:00
xattr.c ANDROID: remove unused variable 2020-05-27 13:20:29 -07:00
xattr.h f2fs: code cleanup by removing ifdef macro surrounding 2020-05-30 08:50:10 -07:00