net/mptcp/protocol.c 977d293e23b4 ("mptcp: ensure tx skbs always have the MPTCP ext") efe686ffce01 ("mptcp: ensure tx skbs always have the MPTCP ext") same patch merged in both trees, keep net-next.
Showing the changes to include/uapi (2 of 332 files). Show all
Unified · Split
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ |
| 2 | 2 | /* |
| 3 | − * include/uapi/linux/cifs/cifs_mount.h | |
| 4 | 3 | * |
| 5 | 4 | * Author(s): Scott Lovenberg (scott.lovenberg@gmail.com) |
| 6 | 5 | * |
| @@ -317,13 +317,19 @@ enum { · 316 unmodified lines | ||
| 317 | 317 | IORING_REGISTER_IOWQ_AFF = 17, |
| 318 | 318 | IORING_UNREGISTER_IOWQ_AFF = 18, |
| 319 | 319 | |
| 320 | − /* set/get max number of workers */ | |
| 320 | + /* set/get max number of io-wq workers */ | |
| 321 | 321 | IORING_REGISTER_IOWQ_MAX_WORKERS = 19, |
| 322 | 322 | |
| 323 | 323 | /* this goes last */ |
| 324 | 324 | IORING_REGISTER_LAST |
| 325 | 325 | }; |
| 326 | 326 | |
| 327 | +/* io-wq worker categories */ | |
| 328 | +enum { | |
| 329 | + IO_WQ_BOUND, | |
| 330 | + IO_WQ_UNBOUND, | |
| 331 | +}; | |
| 332 | + | |
| 327 | 333 | /* deprecated, see struct io_uring_rsrc_update */ |
| 328 | 334 | struct io_uring_files_update { |
| 329 | 335 | __u32 offset; |