diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-18 21:37:07 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-18 21:37:07 -0300 |
| commit | ab1c247094e323177a578b38f0325bf79f0317ac (patch) | |
| tree | 97ff10609587158d6f726f5d1b118b13339501d9 /tools/perf/trace | |
| parent | 71225af17f611632226a4a2fae25235fd8dad268 (diff) | |
| parent | 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/trace')
| -rw-r--r-- | tools/perf/trace/beauty/include/linux/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h index 39b74d83c7c4..cfcb7e2c3813 100644 --- a/tools/perf/trace/beauty/include/linux/socket.h +++ b/tools/perf/trace/beauty/include/linux/socket.h @@ -383,6 +383,7 @@ struct ucred { #define SOL_MPTCP 284 #define SOL_MCTP 285 #define SOL_SMC 286 +#define SOL_VSOCK 287 /* IPX options */ #define IPX_TYPE 1 |