diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-08-10 12:01:42 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-08-10 12:01:42 +0300 |
| commit | 4b41ea606e535d47636ac4f5283834e9f6c5fa53 (patch) | |
| tree | 3aca6a13a01782c5ee2de1bb1c9b14d93e95433a /include/uapi | |
| parent | d92df42d7685445a2b6c815d9230d9699d9d400b (diff) | |
| parent | ff363f480e5997051dd1de949121ffda3b753741 (diff) | |
| download | linux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.tar.xz | |
Merge branch 'irq/urgent' into irq/core
to pick up fixes on which further changes depend on.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/idxd.h | 2 | ||||
| -rw-r--r-- | include/uapi/rdma/irdma-abi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/idxd.h b/include/uapi/linux/idxd.h index e33997b4d750..edc346a77c91 100644 --- a/include/uapi/linux/idxd.h +++ b/include/uapi/linux/idxd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ /* Copyright(c) 2019 Intel Corporation. All rights rsvd. */ #ifndef _USR_IDXD_H_ #define _USR_IDXD_H_ diff --git a/include/uapi/rdma/irdma-abi.h b/include/uapi/rdma/irdma-abi.h index 26b638a7ad97..a7085e092d34 100644 --- a/include/uapi/rdma/irdma-abi.h +++ b/include/uapi/rdma/irdma-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB */ /* * Copyright (c) 2006 - 2021 Intel Corporation. All rights reserved. * Copyright (c) 2005 Topspin Communications. All rights reserved. |