To pick the changes from: 6b2a51ff03bf0c54 ("fscrypt: Add HCTR2 support for filename encryption") That don't result in any changes in tooling, just causes this to be rebuilt: CC /tmp/build/perf-urgent/trace/beauty/sync_file_range.o LD /tmp/build/perf-urgent/trace/beauty/perf-in.o addressing this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h' diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -27,7 +27,8 @@ · 26 unmodified lines | |||
| 27 | #define FSCRYPT_MODE_AES_128_CBC 5 | 27 | #define FSCRYPT_MODE_AES_128_CBC 5 |
| 28 | #define FSCRYPT_MODE_AES_128_CTS 6 | 28 | #define FSCRYPT_MODE_AES_128_CTS 6 |
| 29 | #define FSCRYPT_MODE_ADIANTUM 9 | 29 | #define FSCRYPT_MODE_ADIANTUM 9 |
| 30 | /* If adding a mode number > 9, update FSCRYPT_MODE_MAX in fscrypt_private.h */ | 30 | #define FSCRYPT_MODE_AES_256_HCTR2 10 |
| 31 | /* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */ | ||
| 31 | 32 | ||
| 32 | /* | 33 | /* |
| 33 | * Legacy policy version; ad-hoc KDF and no key verification. | 34 | * Legacy policy version; ad-hoc KDF and no key verification. |