Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools headers UAPI: Sync linux/fscrypt.h with the kernel sources

To pick the changes from:

f8b435f93b7630af ("fscrypt: remove unused Speck definitions")
e0cefada1383c5ce ("fscrypt: Add SM4 XTS/CTS symmetric algorithm support")

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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Link: https://lore.kernel.org/lkml/Y6CHSS6Rn9YOqpAd@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+2 -2
+2 -2
tools/include/uapi/linux/fscrypt.h
··· 26 26 #define FSCRYPT_MODE_AES_256_CTS 4 27 27 #define FSCRYPT_MODE_AES_128_CBC 5 28 28 #define FSCRYPT_MODE_AES_128_CTS 6 29 + #define FSCRYPT_MODE_SM4_XTS 7 30 + #define FSCRYPT_MODE_SM4_CTS 8 29 31 #define FSCRYPT_MODE_ADIANTUM 9 30 32 #define FSCRYPT_MODE_AES_256_HCTR2 10 31 33 /* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */ ··· 187 185 #define FS_ENCRYPTION_MODE_AES_256_CTS FSCRYPT_MODE_AES_256_CTS 188 186 #define FS_ENCRYPTION_MODE_AES_128_CBC FSCRYPT_MODE_AES_128_CBC 189 187 #define FS_ENCRYPTION_MODE_AES_128_CTS FSCRYPT_MODE_AES_128_CTS 190 - #define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7 /* removed */ 191 - #define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8 /* removed */ 192 188 #define FS_ENCRYPTION_MODE_ADIANTUM FSCRYPT_MODE_ADIANTUM 193 189 #define FS_KEY_DESC_PREFIX FSCRYPT_KEY_DESC_PREFIX 194 190 #define FS_KEY_DESC_PREFIX_SIZE FSCRYPT_KEY_DESC_PREFIX_SIZE