diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
| commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 (patch) | |
| tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d /include/rdma | |
| parent | netfilter: nf_tables: add support for matching IPv4 options (diff) | |
| parent | Merge branch 'cxgb4-Reference-count-MPS-TCAM-entries-within-a-PF' (diff) | |
| download | linux-dev-1c5ba67d2277ac2faf37c61076e8b5fa312be492.tar.xz linux-dev-1c5ba67d2277ac2faf37c61076e8b5fa312be492.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/ib_verbs.h | 1 | ||||
| -rw-r--r-- | include/rdma/mr_pool.h | 10 | ||||
| -rw-r--r-- | include/rdma/rw.h | 10 |
3 files changed, 3 insertions, 18 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0742095355f2..54873085f2da 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2698,6 +2698,7 @@ struct ib_client { const char *name; void (*add) (struct ib_device *); void (*remove)(struct ib_device *, void *client_data); + void (*rename)(struct ib_device *dev, void *client_data); /* Returns the net_dev belonging to this ib_client and matching the * given parameters. diff --git a/include/rdma/mr_pool.h b/include/rdma/mr_pool.h index 986010b812eb..83763ef82354 100644 --- a/include/rdma/mr_pool.h +++ b/include/rdma/mr_pool.h @@ -1,14 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2016 HGST, a Western Digital Company. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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. */ #ifndef _RDMA_MR_POOL_H #define _RDMA_MR_POOL_H 1 diff --git a/include/rdma/rw.h b/include/rdma/rw.h index a3cbbc7b6417..494f79ca3e62 100644 --- a/include/rdma/rw.h +++ b/include/rdma/rw.h @@ -1,14 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2016 HGST, a Western Digital Company. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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. */ #ifndef _RDMA_RW_H #define _RDMA_RW_H |