From patchwork Wed Mar 14 04:01:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10281427 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1999602BD for ; Wed, 14 Mar 2018 04:02:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B21E1286D1 for ; Wed, 14 Mar 2018 04:02:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0548286B6; Wed, 14 Mar 2018 04:02:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BED7728856 for ; Wed, 14 Mar 2018 04:01:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750751AbeCNEBv (ORCPT ); Wed, 14 Mar 2018 00:01:51 -0400 Received: from mail-eopbgr30079.outbound.protection.outlook.com ([40.107.3.79]:15269 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750737AbeCNEBu (ORCPT ); Wed, 14 Mar 2018 00:01:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=RUPmtD0/VoHLMI8rgUha/j0bWguAG7vnNZpyr21yPQc=; b=ilCo8y6wpLNcsdVRNiySd4DX17IAFCULtpz/O3RNdEC/JXMzpXezJeODdR1bSaRzwvRUIoOPsL92/yaUJunihoLO6n+qXCCMLBUu/nnthxrjzoNERyzCH9FgX2ocr9FxX1nEUAhV/jDVP+WYKZTlB0p5NcyVv6uaDiRgNKEUrBI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; Received: from mlx.ziepe.ca (174.3.196.123) by HE1PR0501MB2860.eurprd05.prod.outlook.com (2603:10a6:3:c2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 14 Mar 2018 04:01:46 +0000 Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1evxbY-0005ID-1x; Tue, 13 Mar 2018 22:01:32 -0600 Date: Tue, 13 Mar 2018 22:01:32 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Faisal Latif , Shiraz Saleem Subject: [PATCH v2] RDMA/i40iw: Move uapi header to include/uapi Message-ID: <20180314040132.GA20236@ziepe.ca> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [174.3.196.123] X-ClientProxiedBy: MWHPR20CA0040.namprd20.prod.outlook.com (2603:10b6:300:ed::26) To HE1PR0501MB2860.eurprd05.prod.outlook.com (2603:10a6:3:c2::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 658a8bbd-4603-4a86-179e-08d589604e39 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0501MB2860; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2860; 3:w5Y7gdKPXqXI9Bx0v14GLlAIXWt00hShjUHFmGR4kJs/sxyN3nyykxio9Q1hv6dvP8rg3M2FaV88PG9EY7FVK1I327XIDdIgSfo2uXXEcka8CG9ojjR9NaEkN6fulX4n/DHQH6PThu9AQvD7KcGjytyqdsMGPPSiSyPQmSVRLvCNOaymd3r0GJ+31Y4qKBocZUIjrPzqK8tlZTR8l/c8Iwf1jyXIVQd4gQJlmAuzWNa9xiJvBkiOxuxeF3vPbxyy; 25:XYrRbi/nfIoVbwPNMwA5rSSf+m+74eCdkeSv/5CVfAQOannAEegtzX31bkep04VRBmtPIIelLkizdudjc3WwHLa2+n42PQU2+KURjY1kZ/5ZJGCV0ihHSdp/JXStAkT0cPDp40GlTsqgE1lswixSILD/HRFrkTRHMarj/rWSagNVxpoeHbVfw1HijWa0EKznkzpYMzf/npoAEH+G2hapoUZrhyJPFZn45tyxBiQvypD4WeVcIaI1BFHCrS7CD/+BkQhdw70ShZFBb73XMHa4X5y1cg2YQs1Dok3iSprxEILZxSRPGQ8DSvj4BOiWUt1LzHvWv6LtrWqO2zPMoNg7Rg==; 31:2lpBTwZ4TU6UTFgnh0s8hslqAUx+zbcTVW7+ku32PvBriaktdt7w7ccuWES49hGqZdfKrUWLoOESKAiFdIB7yj9+rqEbEK/Wor8n5D2IUeC9Ih/hjWAEva8J6O+qZ/ad2+fwW303DEXwJwvugNp985niVj6MeAX8ACZ0FeRL7kgZWWnRJ+9Wg5P2NREcyk44Yj7h+JIQH+6ppaN6qBo8/1j2bTjxHPEmUlrJ3yLF8gw= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2860: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2860; 20:6O/K+FSUtpW1jmBc92wdFcV3iuEfyGmzwVVtRuOVt7dAlQfXsUGYp8EhIHZ0DSjFZT5lB3JkWg2NORES6w5PRl1nGWIPcBoWug+5JJx9jpxL9y9Q+SWRuF0OC51nOnOduvUdVPvmaP6yAp2Q3ct2vot/J8DfPyxAdi6OUHNwKwHfyfhFqd0IVyzkIsqMCgVtUqlSVREtRmaalKSPbCXWTegATlGv8jOO4jG6KRJhLttNS7a/eEJ7AL2EQJBDa8hron2NWK2QgCHgAL8fXdeZDHQm2Fq7Dap7LY99+wIwuL+ENzLopzGq4XFWyipjh8lYCeAmP6BkgghQxDQC/XbDsv/Wsdwb5oOqFM9vHpLUnOByQTf0EM+ZOvDsX1o52M1I9PKsfSKtFGYNU05YC38Tvwsar+fwcV1Jx90wjeEFZiJ8sGNEVWMdoRXaoS7jCIEoVzyfo5R39Hgr2USo9oqP3w/Du2pNXcLz1K4addjU+iCsnhK/46iGZmLc9CfJK01O; 4:3TBmC05qKTPw/JK7uKFGNrOynXmGeys1JRtYdAOdw6pd2sAZGHmyXYwlvwWqNgnlF2l5ZJfgS3/Q2CS0pJA8JbecLGiV1RtEkRNQBeDDLUuwGBgKywr0vE7E8Iv2f2fDIU/q5K1enpLRIjhLLq5/kR7fsrlm1GD2ycZd67NJpkoc+0fFie3tS0JavFGAfd9ylNujURbhHAa+gkJqu2lOHhOtbS43VgXRfZndBS5NzigsqXYtEvIfWI3Rj2a3BVyoyx0pyHYqKwnJA4y6eQuFYQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR0501MB2860; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2860; X-Forefront-PRVS: 0611A21987 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(366004)(39860400002)(39380400002)(199004)(189003)(83796002)(3846002)(33896004)(33656002)(7736002)(6916009)(57986006)(9686003)(5660300001)(68736007)(81156014)(6116002)(23726003)(86362001)(4326008)(97736004)(105586002)(305945005)(2361001)(122856001)(1076002)(9786002)(478600001)(81166006)(52116002)(9746002)(386003)(316002)(16586007)(53936002)(47776003)(58126008)(8936002)(66066001)(46656002)(2351001)(26005)(50466002)(8676002)(54906003)(69596002)(2906002)(36756003)(106356001)(186003)(18370500001)(24400500001)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2860; H:mlx.ziepe.ca; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0501MB2860; 23:AU0r3ZilURdCMutyLrJ2GAOd3f++ebToKaClxKX?= =?us-ascii?Q?GvuzzcMMU4mXcdJPhAAXkcZPC36bnVVtwTRsfjA9od1jhciXzF7ssZDEGNNM?= =?us-ascii?Q?mabUJoW+hjtGWqysTkToye10dCBWp2UdDfigccKX1XgFYUBoKlXE9XNMJeiG?= =?us-ascii?Q?Q2Nj2mj+g9CR06/bJKPEsSay3jJrfcyR6kvL4uMubCX8cPc5Bt3YE5xH9ygj?= =?us-ascii?Q?OjtpTnHrNSucvGq+hsI1Q6J2x2PNZypY+6K4l72hwZjRTaNe3t1hMvq+wJmq?= =?us-ascii?Q?ltyBnV9ntcwCW3WCMM/K4ot2tyIXUkgdlXlvcj0wrMC2+jjHpngIqjurUCsO?= =?us-ascii?Q?a/yQr993PRb7CYkohxUyWQTzyAejtYgDJMDZvoLogYl2NL1BQ8SxyG6GgIvo?= =?us-ascii?Q?HT89ilP0pCuCpw7Hy4QA54g9Khy4OxVtTJlF5/VqiJaZux0XbkOrnaCf0eDj?= =?us-ascii?Q?wPLNsASrdb99gpR5QUdH06P0tXDtuiXfi6LN/7noXkB8dS/tGITSrGbqDpZ4?= =?us-ascii?Q?dCAqvy25av5v7Gsg2SdfNMdEqieCg5FkLFB5DLY9EvkvRpaLv4HbMWreNuzF?= =?us-ascii?Q?VI9YvKY9aurHFFQ1CI5P1REvVJ8TyzRkPLyYAfN/xYOiPp5/TuZW3eZAb8MH?= =?us-ascii?Q?tlJKl8IjD9nC0nZEtNSAHwWOJcBuewCUEQWBT1X6iCJvbZ6e/pm9j+UFP7Tf?= =?us-ascii?Q?1MM40vA8kQweJ8AjHWRROIb+BvBcVF+NyHL2eO2KBQ4BJLDwhsyINuPD5VbN?= =?us-ascii?Q?OFxRTzpqf3uOQTo4aRlGSUmcwKtmR3hcJ0LT3lku02xnko/z3tse4zNsBYds?= =?us-ascii?Q?vFiT1qe+b68gh8gUI7L7r4HOJfqbb3DDZaZbw39C4sop9kUhLTKH0hyCerS0?= =?us-ascii?Q?mkydn+TUobjV0E6kgz0D5HEGS43x/ojDum95l1CZzRFWSwYmxCbC25FZnaNb?= =?us-ascii?Q?9r48tfijLH5FUATZull101uG8FfYtLw+opvFZm+LRONGLvh6HuxyVIJAFHAa?= =?us-ascii?Q?jlGhgxcgoJRkXXQJHyKfPs6bxAQuMnMHx6pA8S2w5Iq9n19AFXz7cVuFGmH6?= =?us-ascii?Q?9/5h8vRbusQITgceUaUmQKfk3GTQf26sB+LyuYr9+IR/EdOlbWOwtnOtOZB6?= =?us-ascii?Q?N9x09bl7O2nzkkpC+SBECkZpQadMuqh2ztIQbx/QNnNF0n76UgihyfY+8Pds?= =?us-ascii?Q?/Bb22Z9VH4HFO7eeelZoZ3vydgCEc/sA/EaPgiLniycl7PSvjSNNUXSf7kTv?= =?us-ascii?Q?TsbTM+RTjCFwkrIA5OOW7xXjYDnsuCcPMptzCTPDh?= X-Microsoft-Antispam-Message-Info: LF434eU7ix5nftZzGD1z6fi1asWqADi7htAkoJ3oEZ5BsYHs0JfJUMOaoavXjpV7OMZJX1rW4QWBkJiQKqcltCI10cbdNTOSSw0cc+JH6wGdM5wkX0dENd/oLivr+TJE9e9uNfKwpb7X4+A11wJnkuJmH4f3fH2dZrJLzXgoizHRqMBQ2/sh35xsBNYCkHok X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2860; 6:zH+7+2znjVxqbvj6SkjZftwAztpIh/T1FHRgcTRlKuHNZtehmnmHF+NSkbfbXIqGxQ+7wYWZFr4W9kM82l5PNpEOCPEv919mf4Y66r6S2XZL/dcXT/+c1SzLUyIuxDrdU4VwMpWQoy2SMkSkttkh5RxBL3kycOXjfxU3rY5HuB35A/GiY4npdU5MkH/E34Lfj5bo6f7oHjTh1Ti3k9xLoAmqK6pREva3Jh2bNS0KVcUOdlNspyCJQudh1gaVeejG2bQYF8o5TndrHQxihSpXRahD5bI7VTrxh2gXs9IBeQYLwVQSIR++uyW+oJwEyAO71+oBubzCCZdyG5lruDWIlfHSEuVNqJnWkOBJca9Koso=; 5:mNbuZNqZ+pW8DoqHlC4s/1gf8eWW90KVmC/ZNsU9mEzs6wGqwAbrUWi7HAOI3O0NiY42H50u/DDS7w7OiPONn3Ge/fj/u2ytJPOXyGcfMvaaAFLu9hxVmPLIhId7tgQUohkKF+t92MxFtCcbDuq0+CL7x9M0eQE0PaUqdVGOVvc=; 24:234RSxQ8Yip+fwfrCPZ1v+Xi9f+lLUZwYlPeQDyvuocVHNaPhNaT1CvsMqEMrfGQl8ZR1ZQikooAyYOBABtGov8pk/W5bvs1GYGmwmj358s=; 7:enx/EleAg9x6r+b5mnA8gy6TYHqn4tyFXjVAC5UQkVAnTyYRYpFim0SBPG9sTjp2RmyLmMDxcet75zVJGiOdDh0MdwgqYpSLyTnLszyV+h58IG8nuXjwwRZvKpe0sh41rGxgSCShqXu+t1g7UPXe8NF9bzREYYBiNxe1nTdtG04IFTYiePEZd5V0XyTJYTI49krMKZO2POnQKyjJCHXpMY5Byz/8kU0wnHgn78BCYWCcGiViZMSUHInJHZ5/bM7k SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2018 04:01:46.2992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 658a8bbd-4603-4a86-179e-08d589604e39 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2860 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All of these defines are part of the uABI for the driver, this header duplicates providers/i40iw/i40iw-abi.h in rdma-core. Signed-off-by: Jason Gunthorpe Acked-by: Shiraz Saleem --- drivers/infiniband/hw/i40iw/i40iw.h | 2 +- .../hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename drivers/infiniband/hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h (98%) Ugh, somehow the wrong version of this got sent, the first hunk was missed. Sorry. diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h index a20650f060ce93..50dc50e8391806 100644 --- a/drivers/infiniband/hw/i40iw/i40iw.h +++ b/drivers/infiniband/hw/i40iw/i40iw.h @@ -60,7 +60,7 @@ #include #include "i40iw_type.h" #include "i40iw_p.h" -#include "i40iw_ucontext.h" +#include #include "i40iw_pble.h" #include "i40iw_verbs.h" #include "i40iw_cm.h" diff --git a/drivers/infiniband/hw/i40iw/i40iw_ucontext.h b/include/uapi/rdma/i40iw-abi.h similarity index 98% rename from drivers/infiniband/hw/i40iw/i40iw_ucontext.h rename to include/uapi/rdma/i40iw-abi.h index 57d3f1d11ff1f5..bfc3aaf2e56a5b 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_ucontext.h +++ b/include/uapi/rdma/i40iw-abi.h @@ -34,8 +34,8 @@ * */ -#ifndef I40IW_USER_CONTEXT_H -#define I40IW_USER_CONTEXT_H +#ifndef I40IW_ABI_H +#define I40IW_ABI_H #include