diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 14:50:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 14:50:06 +0100 |
| commit | 63ffd29793580ce1b3e66f2d0278153ec680c323 (patch) | |
| tree | 4e4015d50031f9afc74e3867d1a5c13e1975ca46 /include/uapi/linux/devlink.h | |
| parent | cbb9335c899458fba61392e28c22e12470de1e50 (diff) | |
| parent | 1df10cef2d1e7f9f2fb7eddb67fc70d3abf101f9 (diff) | |
| download | linux-next-63ffd29793580ce1b3e66f2d0278153ec680c323.tar.gz linux-next-63ffd29793580ce1b3e66f2d0278153ec680c323.zip | |
Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# MAINTAINERS
# drivers/net/amt.c
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 ca713bcc47b9..a6801feb7744 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -648,6 +648,8 @@ enum devlink_attr { DEVLINK_ATTR_INDEX, /* uint */ DEVLINK_ATTR_RESOURCE_SCOPE_MASK, /* u32 */ + DEVLINK_ATTR_PARENT_DEV, /* nested */ + /* Add new attributes above here, update the spec in * Documentation/netlink/specs/devlink.yaml and re-generate * net/devlink/netlink_gen.c. |