diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-27 10:09:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-27 10:09:49 +0100 |
| commit | 9b9c280b9af2aa851d83e7d0b79f36a3d869d745 (patch) | |
| tree | b61cf8566669d9615234e87696a833ee487e2655 /net/xfrm/xfrm_algo.c | |
| parent | 6be4ec29685c216ebec61d35f56c3808092498aa (diff) | |
| parent | 8009479ee919b9a91674f48050ccbff64eafedaa (diff) | |
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/xfrm/xfrm_algo.c')
| -rw-r--r-- | net/xfrm/xfrm_algo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 41533c631431..e6da7e8495c9 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -858,4 +858,5 @@ int xfrm_count_pfkey_enc_supported(void) } EXPORT_SYMBOL_GPL(xfrm_count_pfkey_enc_supported); +MODULE_DESCRIPTION("XFRM Algorithm interface"); MODULE_LICENSE("GPL"); |