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 /fs/9p/cache.h | |
parent | 88447c5b93d98be847f428c39ba589779a59eb83 (diff) | |
parent | 975a6166a8584ee4a1b8bd93098e49dc101d7171 (diff) | |
download | talos-op-linux-48c7d73b2362ce61503551ad70052617b3e8857d.tar.gz talos-op-linux-48c7d73b2362ce61503551ad70052617b3e8857d.zip |
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 'fs/9p/cache.h')
-rw-r--r-- | fs/9p/cache.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/fs/9p/cache.h b/fs/9p/cache.h index 247e47e54bcc..00f107af443e 100644 --- a/fs/9p/cache.h +++ b/fs/9p/cache.h @@ -1,23 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * V9FS cache definitions. * * Copyright (C) 2009 by Abhishek Kulkarni <adkulkar@umail.iu.edu> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to: - * Free Software Foundation - * 51 Franklin Street, Fifth Floor - * Boston, MA 02111-1301 USA - * */ #ifndef _9P_CACHE_H |