History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor SPDX change conflict.

David S. Miller committed 7 years ago

Commit 92ad6322 parents e0effb5 c356dc45301 files · +7190 −26605Browse files

Showing the changes to include/uapi/linux (2 of 5301 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/psp-sev.h +1 −4
  2. include/uapi/linux/wmi.h +1 −4
include/uapi/linux/psp-sev.h+1−4
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
1/*2/*
2 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)3 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
3 * platform management commands.4 * platform management commands.
@@ -7,10 +8,6 @@ · 3 unmodified lines
7 * Author: Brijesh Singh <brijesh.singh@amd.com>8 * Author: Brijesh Singh <brijesh.singh@amd.com>
8 *9 *
9 * SEV API specification is available at: https://developer.amd.com/sev/10 * SEV API specification is available at: https://developer.amd.com/sev/
10 *
11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License version 2 as
13 * published by the Free Software Foundation.
14 */11 */
15 12
16#ifndef __PSP_SEV_USER_H__13#ifndef __PSP_SEV_USER_H__
include/uapi/linux/wmi.h+1−4
@@ -1,11 +1,8 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
1/*2/*
2 * User API methods for ACPI-WMI mapping driver3 * User API methods for ACPI-WMI mapping driver
3 *4 *
4 * Copyright (C) 2017 Dell, Inc.5 * Copyright (C) 2017 Dell, Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */6 */
10#ifndef _UAPI_LINUX_WMI_H7#ifndef _UAPI_LINUX_WMI_H
11#define _UAPI_LINUX_WMI_H8#define _UAPI_LINUX_WMI_H