On Tue, Oct 01, 2019 at 08:11:59AM -0300, Arnaldo Carvalho de Melo wrote: > From: Arnaldo Carvalho de Melo <[email protected]> > > To pick the changes from: > > 78a1b96bcf7a ("fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS ioctl") > 23c688b54016 ("fscrypt: allow unprivileged users to add/remove keys for v2 > policies") > 5dae460c2292 ("fscrypt: v2 encryption policy support") > 5a7e29924dac ("fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl") > b1c0ec3599f4 ("fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl") > 22d94f493bfb ("fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl") > 3b6df59bc4d2 ("fscrypt: use FSCRYPT_* definitions, not FS_*") > 2336d0deb2d4 ("fscrypt: use FSCRYPT_ prefix for uapi constants") > 7af0ab0d3aab ("fs, fscrypt: move uapi definitions to new header > <linux/fscrypt.h>") > > That don't trigger any changes in tooling, as it so far is used only > for: > > $ grep -l 'fs\.h' tools/perf/trace/beauty/*.sh | xargs grep regex= > > tools/perf/trace/beauty/rename_flags.sh:regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+RENAME_([[:alnum:]_]+)[[:space:]]+\(1[[:space:]]*<<[[:space:]]*([[:xdigit:]]+)[[:space:]]*\)[[:space:]]*.*' > > tools/perf/trace/beauty/sync_file_range.sh:regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+SYNC_FILE_RANGE_([[:alnum:]_]+)[[:space:]]+([[:xdigit:]]+)[[:space:]]*.*' > > tools/perf/trace/beauty/usbdevfs_ioctl.sh:regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*" > > tools/perf/trace/beauty/usbdevfs_ioctl.sh:regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*" > $ > > This silences this perf build warning: > > Warning: Kernel ABI header at 'tools/include/uapi/linux/fs.h' differs from > latest version at 'include/uapi/linux/fs.h' > diff -u tools/include/uapi/linux/fs.h include/uapi/linux/fs.h > > Cc: Adrian Hunter <[email protected]> > Cc: Eric Biggers <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Link: https://lkml.kernel.org/n/[email protected] > Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
What's the reason why you don't just use the include/uapi/ headers directly? - Eric
