diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-31 09:31:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-31 09:31:38 +0200 |
| commit | 1346e9331abe8d08c05148def1cb2cdf03085c40 (patch) | |
| tree | 2cab2825e6292ec41354b5b3da7d4137f5e62941 /include/net/nsh.h | |
| parent | 0995c95b0882ee0ed0ea1930c8918bb0899e924c (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
| download | linux-1346e9331abe8d08c05148def1cb2cdf03085c40.tar.gz linux-1346e9331abe8d08c05148def1cb2cdf03085c40.tar.bz2 linux-1346e9331abe8d08c05148def1cb2cdf03085c40.zip | |
Merge 6.5-rc4 into char-misc-next
We need the char-misc fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/nsh.h')
| -rw-r--r-- | include/net/nsh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/nsh.h b/include/net/nsh.h index 350b1ad11c7f..16a751093896 100644 --- a/include/net/nsh.h +++ b/include/net/nsh.h @@ -192,7 +192,7 @@ /** * struct nsh_md1_ctx - Keeps track of NSH context data - * @nshc<1-4>: NSH Contexts. + * @context: NSH Contexts. */ struct nsh_md1_ctx { __be32 context[4]; |