diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-13 18:20:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-13 18:20:03 +0100 |
| commit | 429c9d8f11904c2986154c2b71a05ec2c0ea3220 (patch) | |
| tree | 3009cc965f49a31aedb047a994082e884964e4c8 /include/uapi/linux | |
| parent | cf9ddb7f521b51a8978e7133e121ab7cfc75fb65 (diff) | |
| parent | 79e5797d243a466138f641932f81dc69f796060c (diff) | |
| download | linux-next-429c9d8f11904c2986154c2b71a05ec2c0ea3220.tar.gz linux-next-429c9d8f11904c2986154c2b71a05ec2c0ea3220.zip | |
Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
# Conflicts:
# drivers/android/binder_alloc.c
# drivers/android/binderfs.c
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/android/binder.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/iio/types.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index 701cad36de43..96e5b0184a1b 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -296,6 +296,7 @@ enum transaction_flags { TF_ACCEPT_FDS = 0x10, /* allow replies with file descriptors */ TF_CLEAR_BUF = 0x20, /* clear buffer on txn complete */ TF_UPDATE_TXN = 0x40, /* update the outdated pending async txn */ + TF_DEFER_COMPLETE = 0x80, /* defer transaction complete to userspace */ }; struct binder_transaction_data { diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index d0fb714ca0fd..d602b40f14d0 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -55,6 +55,7 @@ enum iio_chan_type { IIO_ALTCURRENT, IIO_COVERAGE, IIO_VOLUMEFLOW, + IIO_FREQUENCY, }; enum iio_modifier { |