diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 09:02:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 09:02:14 +0200 |
| commit | dfd5c3ea641b1697333e5f6704e4e5dddfafe86b (patch) | |
| tree | 5eab12757acaec0f7ff07a48f4b66140b78eb969 /include/uapi/rdma/ib_user_cm.h | |
| parent | sched/core: Don't schedule threads on pre-empted vCPUs (diff) | |
| parent | Linux 4.17-rc5 (diff) | |
| download | linux-dfd5c3ea641b1697333e5f6704e4e5dddfafe86b.tar.gz linux-dfd5c3ea641b1697333e5f6704e4e5dddfafe86b.zip | |
Merge tag 'v4.17-rc5' into sched/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/rdma/ib_user_cm.h')
| -rw-r--r-- | include/uapi/rdma/ib_user_cm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/rdma/ib_user_cm.h b/include/uapi/rdma/ib_user_cm.h index 4a8f9562f7cd..e2709bb8cb18 100644 --- a/include/uapi/rdma/ib_user_cm.h +++ b/include/uapi/rdma/ib_user_cm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ /* * Copyright (c) 2005 Topspin Communications. All rights reserved. * Copyright (c) 2005 Intel Corporation. All rights reserved. |