Jaegeuk Kim
51ca215606
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
* aosp/upstream-f2fs-stable-linux-5.10.y:
fs-verity: move structs needed for file signing to UAPI header
fs-verity: rename "file measurement" to "file digest"
fs-verity: rename fsverity_signed_digest to fsverity_formatted_digest
fs-verity: remove filenames from file comments
fscrypt: allow deleting files with unsupported encryption policy
fscrypt: unexport fscrypt_get_encryption_info()
fscrypt: move fscrypt_require_key() to fscrypt_private.h
fscrypt: move body of fscrypt_prepare_setattr() out-of-line
fscrypt: introduce fscrypt_prepare_readdir()
ext4: don't call fscrypt_get_encryption_info() from dx_show_leaf()
ubifs: remove ubifs_dir_open()
f2fs: remove f2fs_dir_open()
ext4: remove ext4_dir_open()
fscrypt: simplify master key locking
fscrypt: remove unnecessary calls to fscrypt_require_key()
ubifs: prevent creating duplicate encrypted filenames
f2fs: prevent creating duplicate encrypted filenames
ext4: prevent creating duplicate encrypted filenames
fscrypt: add fscrypt_is_nokey_name()
fscrypt: remove kernel-internal constants from UAPI header
Conflicts:
fs/crypto/hooks.c
Bug: 174873661
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Id56d42fc959242524628752223e9d773a2c8681c
2021-01-06 09:39:43 -08:00
..
2020-12-09 08:09:26 +01:00
2020-10-24 12:26:05 -07:00
2020-10-24 12:26:05 -07:00
2020-12-10 11:34:58 +01:00
2020-10-16 11:11:22 -07:00
2020-09-18 16:45:50 -04:00
2020-09-18 16:45:50 -04:00
2020-12-30 12:47:03 +01:00
2020-10-28 15:11:54 +01:00
2020-12-30 12:47:03 +01:00
2020-12-30 12:47:03 +01:00
2020-05-05 09:22:21 -06:00
2020-10-16 11:11:19 -07:00
2020-09-18 16:45:50 -04:00
2021-01-06 09:39:43 -08:00
2020-10-30 08:37:39 +01:00
2020-10-15 18:42:13 -07:00
2020-08-08 13:07:20 +02:00
2020-11-25 16:55:02 +01:00
2020-09-18 16:45:50 -04:00
2020-12-30 12:47:03 +01:00
2020-12-26 16:02:38 +01:00
2020-10-28 21:20:34 +01:00
2021-01-06 09:39:43 -08:00
2021-01-06 09:39:43 -08:00
2020-09-18 16:45:50 -04:00
2020-06-03 16:27:18 -07:00
2020-12-30 12:47:03 +01:00
2020-12-03 18:58:23 +01:00
2020-11-02 11:59:56 +01:00
2020-11-02 11:59:56 +01:00
2020-09-18 16:45:50 -04:00
2020-08-12 10:57:56 -07:00
2020-12-10 20:16:16 +00:00
2020-11-09 12:49:27 +01:00
2020-10-29 17:22:59 -05:00
2020-11-19 22:38:29 -05:00
2020-12-30 12:47:03 +01:00
2020-12-30 12:47:03 +01:00
2020-08-07 16:19:28 +02:00
2020-12-30 11:53:30 +01:00
2020-09-18 16:45:50 -04:00
2020-12-30 12:47:03 +01:00
2020-12-30 11:53:45 +01:00
2020-12-30 11:54:18 +01:00
2020-10-24 12:26:05 -07:00
2020-06-14 01:57:21 +09:00
2020-12-30 12:47:03 +01:00
2020-10-24 12:26:05 -07:00
2020-11-15 14:37:09 +01:00
2020-09-22 23:39:45 -04:00
2020-08-12 12:01:09 +02:00
2020-12-30 12:47:03 +01:00
2020-12-30 12:47:03 +01:00
2020-08-23 17:36:59 -05:00
2020-09-18 16:45:50 -04:00
2020-09-18 16:45:50 -04:00
2020-12-26 16:02:45 +01:00
2020-10-16 11:11:22 -07:00
2020-10-26 09:13:37 +01:00
2020-10-24 12:26:05 -07:00
2020-10-28 21:20:34 +01:00
2020-10-02 12:02:30 +02:00
2020-09-18 16:45:50 -04:00
2021-01-06 09:39:43 -08:00
2020-10-24 12:26:05 -07:00
2020-10-24 12:26:05 -07:00
2020-09-27 21:56:06 +00:00
2020-10-15 15:11:56 -07:00
2020-12-28 14:50:32 -08:00
2020-11-23 08:00:16 +01:00
2020-12-10 15:14:19 +09:00
2020-11-10 16:53:07 -08:00
2020-05-29 08:49:31 +02:00
2020-06-03 23:16:55 -04:00
2020-05-07 16:55:47 -05:00
2020-10-16 11:11:21 -07:00
2020-10-29 17:22:59 -05:00
2020-06-04 19:18:29 -07:00
2020-08-24 08:49:13 +10:00
2020-06-04 19:18:29 -07:00
2020-06-04 19:18:29 -07:00
2020-10-05 10:38:33 -06:00
2020-10-18 09:27:09 -07:00
2020-05-14 16:44:23 +02:00
2020-06-05 13:45:21 -07:00
2020-12-06 10:19:07 -08:00
2020-10-14 14:54:45 -07:00
2020-10-19 14:28:30 -07:00
2020-07-29 16:14:27 +02:00
2020-10-26 09:13:37 +01:00
2020-04-27 02:07:40 -04:00
2020-05-06 22:33:43 -04:00
2020-12-30 12:47:03 +01:00
2020-10-16 12:21:15 -07:00
2020-08-23 17:36:59 -05:00
2020-10-17 15:05:30 -06:00
2020-09-30 20:32:32 -06:00
2020-04-10 15:36:22 -07:00
2020-08-23 17:36:59 -05:00
2020-10-13 18:38:27 -07:00
2020-07-29 16:14:27 +02:00
2020-10-13 12:12:44 -07:00
2020-08-23 17:36:59 -05:00
2020-08-04 21:02:38 -04:00
2020-12-30 11:53:49 +01:00
2020-09-22 23:45:57 -04:00
2020-12-30 11:54:04 +01:00
2020-11-04 10:22:56 -07:00
2020-12-30 11:54:03 +01:00
2020-07-31 08:16:01 +02:00
2020-08-08 13:07:20 +02:00
2020-06-14 01:57:21 +09:00
2020-10-05 13:37:04 +02:00
2020-12-21 13:33:13 -08:00
2020-08-23 17:36:59 -05:00
2020-10-27 11:47:16 +01:00
2020-05-14 16:44:24 +02:00
2020-06-12 14:39:46 +02:00
2020-10-28 21:20:34 +01:00
2020-10-24 12:26:05 -07:00
2020-05-13 11:41:22 +02:00
2020-12-30 11:54:24 +01:00
2020-10-11 11:11:35 -07:00
2020-08-08 13:04:28 +02:00
2020-08-08 13:04:28 +02:00
2020-06-24 17:54:12 +02:00
2020-12-30 11:54:02 +01:00
2020-11-02 09:27:39 +01:00
2020-07-31 08:16:00 +02:00
2020-10-15 09:48:49 -07:00
2020-10-29 17:22:59 -05:00
2020-11-15 22:12:53 -05:00
2020-08-23 17:36:59 -05:00
2020-11-02 09:27:41 +01:00
2020-09-26 22:55:05 -04:00
2020-08-27 16:06:47 -04:00
2020-11-10 16:53:11 -08:00
2020-06-25 14:25:32 +02:00
2020-10-26 09:23:33 +01:00
2020-07-31 08:16:01 +02:00
2020-10-25 11:57:29 +01:00