diff options
author | 2019-07-11 15:14:16 +0200 | |
---|---|---|
committer | 2019-07-11 15:14:16 +0200 | |
commit | a45ff5994c9cde41af627c46abb9f32beae68943 (patch) | |
tree | b726cc506ed1b01484f183ab2679cdd618e1e9b1 /include/net/ip.h | |
parent | Documentation: virtual: Add toctree hooks (diff) | |
parent | KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register (diff) | |
download | linux-dev-a45ff5994c9cde41af627c46abb9f32beae68943.tar.xz linux-dev-a45ff5994c9cde41af627c46abb9f32beae68943.zip |
Merge tag 'kvm-arm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for 5.3
- Add support for chained PMU counters in guests
- Improve SError handling
- Handle Neoverse N1 erratum #1349291
- Allow side-channel mitigation status to be migrated
- Standardise most AArch64 system register accesses to msr_s/mrs_s
- Fix host MPIDR corruption on 32bit
Diffstat (limited to 'include/net/ip.h')
-rw-r--r-- | include/net/ip.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 2d3cce7c3e8a..49c672c8cdae 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -13,11 +14,6 @@ * * Changes: * Mike McLagan : Routing by source - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. */ #ifndef _IP_H #define _IP_H |