diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:49:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:49:00 +0200 |
| commit | 38343be0bf9a7d7ef0d160da5f2db887a0e29b62 (patch) | |
| tree | 81ee2ffc1ef64cc9c7757d65d32242d5a6b05911 /Documentation/netlink/specs/ethtool.yaml | |
| parent | 25f51b76f90f10f9bf2fbc05fc51cf685da7ccad (diff) | |
| parent | 7c626ce4bae1ac14f60076d00eafe71af30450ba (diff) | |
Merge 6.11-rc3 into usb-next
We need the usb fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/netlink/specs/ethtool.yaml')
| -rw-r--r-- | Documentation/netlink/specs/ethtool.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index 495e35fcfb21..ea21fe135b97 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -1753,6 +1753,7 @@ operations: request: attributes: - header + - context reply: attributes: - header @@ -1761,7 +1762,6 @@ operations: - indir - hkey - input_xfrm - dump: *rss-get-op - name: plca-get-cfg doc: Get PLCA params. |