| From 8f9f3bf7938851abb3dbbd51dd8ab5950969d783 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 Nov 2025 12:35:02 +0000 |
| Subject: ynl: fix schema check errors |
| |
| From: Donald Hunter <donald.hunter@gmail.com> |
| |
| [ Upstream commit 1adc241f3940c172c8c674a62004d3c34b360ab3 ] |
| |
| Fix two schema check errors that have lurked since the attribute name |
| validation was made more strict: |
| |
| not ok 2 conntrack.yaml schema validation |
| 'labels mask' does not match '^[0-9a-z-]+$' |
| |
| not ok 13 nftables.yaml schema validation |
| 'set id' does not match '^[0-9a-z-]+$' |
| |
| Signed-off-by: Donald Hunter <donald.hunter@gmail.com> |
| Link: https://patch.msgid.link/20251127123502.89142-5-donald.hunter@gmail.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| Documentation/netlink/specs/conntrack.yaml | 2 +- |
| Documentation/netlink/specs/nftables.yaml | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Documentation/netlink/specs/conntrack.yaml b/Documentation/netlink/specs/conntrack.yaml |
| index bef528633b173..db7cddcda50af 100644 |
| --- a/Documentation/netlink/specs/conntrack.yaml |
| +++ b/Documentation/netlink/specs/conntrack.yaml |
| @@ -457,7 +457,7 @@ attribute-sets: |
| name: labels |
| type: binary |
| - |
| - name: labels mask |
| + name: labels-mask |
| type: binary |
| - |
| name: synproxy |
| diff --git a/Documentation/netlink/specs/nftables.yaml b/Documentation/netlink/specs/nftables.yaml |
| index cce88819ba716..17ad707fa0d5d 100644 |
| --- a/Documentation/netlink/specs/nftables.yaml |
| +++ b/Documentation/netlink/specs/nftables.yaml |
| @@ -915,7 +915,7 @@ attribute-sets: |
| type: string |
| doc: Name of set to use |
| - |
| - name: set id |
| + name: set-id |
| type: u32 |
| byte-order: big-endian |
| doc: ID of set to use |
| -- |
| 2.53.0 |
| |
