History

ASoC: Merge up fixes

Merge branch 'for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-6.15 to avoid a bunch of add/add conflicts.

Mark Brown committed 1 year ago

Commit c6141ba2 parents a1462fb 927e6be534 files · +5497 −2723Browse files

Showing the changes to include/uapi (4 of 534 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/io_uring.h +1 −1
  2. include/uapi/linux/landlock.h +6 −2
  3. include/uapi/linux/taskstats.h +1 −1
  4. include/uapi/linux/virtio_snd.h +1 −1
include/uapi/linux/io_uring.h+1−1
@@ -380,7 +380,7 @@ enum io_uring_op { · 379 unmodified lines
380 * result will be the number of buffers send, with380 * result will be the number of buffers send, with
381 * the starting buffer ID in cqe->flags as per381 * the starting buffer ID in cqe->flags as per
382 * usual for provided buffer usage. The buffers382 * usual for provided buffer usage. The buffers
383 * will be contigious from the starting buffer ID.383 * will be contiguous from the starting buffer ID.
384 */384 */
385#define IORING_RECVSEND_POLL_FIRST (1U << 0)385#define IORING_RECVSEND_POLL_FIRST (1U << 0)
386#define IORING_RECV_MULTISHOT (1U << 1)386#define IORING_RECV_MULTISHOT (1U << 1)
include/uapi/linux/landlock.h+6−2
@@ -268,7 +268,9 @@ struct landlock_net_port_attr { · 267 unmodified lines
268 * ~~~~~~~~~~~~~~~~268 * ~~~~~~~~~~~~~~~~
269 *269 *
270 * These flags enable to restrict a sandboxed process to a set of network270 * These flags enable to restrict a sandboxed process to a set of network
271 * actions. This is supported since the Landlock ABI version 4.271 * actions.
272 *
273 * This is supported since Landlock ABI version 4.
272 *274 *
273 * The following access rights apply to TCP port numbers:275 * The following access rights apply to TCP port numbers:
274 *276 *
@@ -291,11 +293,13 @@ struct landlock_net_port_attr { · 16 unmodified lines
291 * Setting a flag for a ruleset will isolate the Landlock domain to forbid293 * Setting a flag for a ruleset will isolate the Landlock domain to forbid
292 * connections to resources outside the domain.294 * connections to resources outside the domain.
293 *295 *
296 * This is supported since Landlock ABI version 6.
297 *
294 * Scopes:298 * Scopes:
295 *299 *
296 * - %LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET: Restrict a sandboxed process from300 * - %LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET: Restrict a sandboxed process from
297 * connecting to an abstract UNIX socket created by a process outside the301 * connecting to an abstract UNIX socket created by a process outside the
298 * related Landlock domain (e.g. a parent domain or a non-sandboxed process).302 * related Landlock domain (e.g., a parent domain or a non-sandboxed process).
299 * - %LANDLOCK_SCOPE_SIGNAL: Restrict a sandboxed process from sending a signal303 * - %LANDLOCK_SCOPE_SIGNAL: Restrict a sandboxed process from sending a signal
300 * to another process outside the domain.304 * to another process outside the domain.
301 */305 */
include/uapi/linux/taskstats.h+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
34 */34 */
35 35
36 36
37#define TASKSTATS_VERSION 1437#define TASKSTATS_VERSION 15
38#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN38#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
39 * in linux/sched.h */39 * in linux/sched.h */
40 40
include/uapi/linux/virtio_snd.h+1−1
@@ -25,7 +25,7 @@ struct virtio_snd_config { · 24 unmodified lines
25 __le32 streams;25 __le32 streams;
26 /* # of available channel maps */26 /* # of available channel maps */
27 __le32 chmaps;27 __le32 chmaps;
28 /* # of available control elements */28 /* # of available control elements (if VIRTIO_SND_F_CTLS) */
29 __le32 controls;29 __le32 controls;
30};30};
31 31