Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.
Showing the changes to tools/include (1 of 549 files). Show all
Unified · Split
| @@ -1467,8 +1467,8 @@ union bpf_attr { · 1466 unmodified lines | |||
| 1467 | * If no cookie has been set yet, generate a new cookie. Once | 1467 | * If no cookie has been set yet, generate a new cookie. Once |
| 1468 | * generated, the socket cookie remains stable for the life of the | 1468 | * generated, the socket cookie remains stable for the life of the |
| 1469 | * socket. This helper can be useful for monitoring per socket | 1469 | * socket. This helper can be useful for monitoring per socket |
| 1470 | * networking traffic statistics as it provides a unique socket | 1470 | * networking traffic statistics as it provides a global socket |
| 1471 | * identifier per namespace. | 1471 | * identifier that can be assumed unique. |
| 1472 | * Return | 1472 | * Return |
| 1473 | * A 8-byte long non-decreasing number on success, or 0 if the | 1473 | * A 8-byte long non-decreasing number on success, or 0 if the |
| 1474 | * socket field is missing inside *skb*. | 1474 | * socket field is missing inside *skb*. |