diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 | 
| commit | 48c7d73b2362ce61503551ad70052617b3e8857d (patch) | |
| tree | 6b5ca29fb7964d29128a8d476317c27a61462e52 /net/unix/sysctl_net_unix.c | |
| parent | 88447c5b93d98be847f428c39ba589779a59eb83 (diff) | |
| parent | 975a6166a8584ee4a1b8bd93098e49dc101d7171 (diff) | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd:
 - Fix a potential crash after kexec on arm64 with GICv3
 - Fix a build warning on x86
 - Stop policing the BGRT feature flags
 - Use a non-blocking version of SetVariable() in the boot control driver
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
| -rw-r--r-- | net/unix/sysctl_net_unix.c | 6 | 
1 files changed, 1 insertions, 5 deletions
| diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index b3d515021b74..c09bea89151b 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later  /*   * NET4:	Sysctl interface to net af_unix subsystem.   *   * Authors:	Mike Shaver. - * - *		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.   */  #include <linux/mm.h> | 
