Merge branch 'io_uring-7.0' into for-next

axboe · axboe · commit d61665c92237 · 2026-03-26T07:16:01.000-06:00
* io_uring-7.0:
  io_uring/fdinfo: fix SQE_MIXED SQE displaying
diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
@@ -125,6 +125,7 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)
 					sq_idx);
 				break;
 			}
+			i++;
 			sqe128 = true;
 		}
 		seq_printf(m, "%5u: opcode:%s, fd:%d, flags:%x, off:%llu, "

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx ctx, struct seq_file m)`
`125`	`125`	`sq_idx);`
`126`	`126`	`break;`
`127`	`127`	`}`
	`128`	`+ i++;`
`128`	`129`	`sqe128 = true;`
`129`	`130`	`}`
`130`	`131`	`seq_printf(m, "%5u: opcode:%s, fd:%d, flags:%x, off:%llu, "`