diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-11-06 15:49:33 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-11-06 15:49:33 -0300 |
| commit | 7f9f879243d6cf5d2d60d12065e93189cc343387 (patch) | |
| tree | e74619a16f8291f7225ee9877cf93e530243e0d3 /include/uapi/linux/devlink.h | |
| parent | 32f7aa2731b24ad8393f26d63df959d74844345f (diff) | |
| parent | fe91c4725aeed35023ba4f7a1e1adfebb6878c23 (diff) | |
| download | cachepc-linux-7f9f879243d6cf5d2d60d12065e93189cc343387.tar.gz cachepc-linux-7f9f879243d6cf5d2d60d12065e93189cc343387.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up some tools/perf/ patches that went via tip/perf/core, such
as:
tools/perf: Add mem_hops field in perf_mem_data_src structure
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/uapi/linux/devlink.h')
| -rw-r--r-- | include/uapi/linux/devlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 32f53a0069d6..b897b80770f6 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -551,6 +551,8 @@ enum devlink_attr { DEVLINK_ATTR_RATE_NODE_NAME, /* string */ DEVLINK_ATTR_RATE_PARENT_NODE_NAME, /* string */ + DEVLINK_ATTR_REGION_MAX_SNAPSHOTS, /* u32 */ + /* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX, |