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/ipv4/esp4.c | |
| parent | x86/apic: Build the x86 topology enumeration functions on UP APIC builds too (diff) | |
| parent | x86/bugs: Use fixed addressing for VERW operand (diff) | |
| download | linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.gz linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.bz2 linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.zip | |
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/ipv4/esp4.c')
| -rw-r--r-- | net/ipv4/esp4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 4ccfc104f13a..4dd9e5040672 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -1247,5 +1247,6 @@ static void __exit esp4_fini(void) module_init(esp4_init); module_exit(esp4_fini); +MODULE_DESCRIPTION("IPv4 ESP transformation library"); MODULE_LICENSE("GPL"); MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_ESP); |