From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751630AbeAQDDx (ORCPT + 1 other); Tue, 16 Jan 2018 22:03:53 -0500 Received: from mail-db5eur01on0074.outbound.protection.outlook.com ([104.47.2.74]:56000 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750811AbeAQDDv (ORCPT ); Tue, 16 Jan 2018 22:03:51 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; Date: Tue, 16 Jan 2018 20:03:29 -0700 From: Jason Gunthorpe To: Stephen Rothwell Cc: Doug Ledford , Linux-Next Mailing List , Linux Kernel Mailing List , Daniel Jurgens , Leon Romanovsky Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree Message-ID: <20180117030329.GC15750@mellanox.com> References: <20180117125145.731ba88b@canb.auug.org.au> <20180117125537.06e46610@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180117125537.06e46610@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [70.74.179.152] X-ClientProxiedBy: MWHPR13CA0040.namprd13.prod.outlook.com (2603:10b6:300:95::26) To VI1PR0501MB2864.eurprd05.prod.outlook.com (2603:10a6:800:9b::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 57e9a3d0-7d06-46bc-e92e-08d55d56ecf7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020);SRVR:VI1PR0501MB2864; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0501MB2864;3:MO1tH+83U/KogqtjgYiulf2YJt6YLVzvMGDtUfCHJQWqgyDL9uKtHUHp7i/2EC5Mreq/yLIlz3avq24BxMQ440zyyI4TZFWfQ9MUMc5H+94r0qJ3vqo3RPBtw5alI8CezM53LGwqz1fk8hVsx75+fmF5mZ9jyvuYTe61FvYfVLG/TLf51BQUJw0rtWWztqZOFGqHDT4r92gs5obNEGUOkXkfEmgYbfi4clVmHoU6xI8vdd9GVewTkfEocozTYNud;25:NjcUvA/CRUodJgsOnCAkUS4Teusy3ZUDc4EqjqU5GcMBggW4u3Y5I9iyk8hq2fuLLkHrFxaRGdOyWHEIH1Sf299oCD6JlNhaAlhzPLMRJbN4qdYunj28Fv1Lqgowa9uILnoCDRYZAEw2+S/akkWUyQ4tMeZ+gG/2gMRjnWOaHwIjUSNMjnJnvCQOQWt20PWv0VorO10svW+rdCXnOLFssIhBlBTbdSBtwqkEBT3vBMxTHyoF94ibPpYHtA7zyEFvk3HPy8EXitn6FcsGKtCv1nOnhH2ammWuht8iV32LeSw2So6vXncvUVXiwzxSWrbzOojpHzmKt2qzwa/cjtq3Gg==;31:L7czghkr6bAtRT4gEHQCLwVvu/8jUALS8KqA/W1dlGOOt3+Y6Y9DK91EBWuZ8hCIS5gm3eVPAubDGykBAXKOpmQA/FVG3Pzru/pr0xNkHbHY1qFk20RH7DCABjBHAv4mofFY+AjPCil8A51DyieJjkLAatjrx8l3buNpM3itzmAscngsTpAS2nbTPiZs9DVt7NuLV1bsKjOoEOMzsrjMIvCj4OwZnRkB6eFrSmSvQ4Y= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2864: X-Microsoft-Exchange-Diagnostics: 1;VI1PR0501MB2864;20:Qzwb1Q/8ioDnU6TWjaJ6Tq1y1l3oPtKlntqmyfL1VWYh5RLyUhgTUNwpZyoKuGBh6cP4rApwvGXaZakKhUlGnarp3aVDBm8vJdxDieH6mrMmI+YAuXEbzgxE4dUP+XDvKJZxJ5d1t5fO3S1A2ZcJX9Wx2uiMu8zV4TZ+VTCb9ulXSxUWNXRdHSqdcsFCW6+J/ZB4e6XsgrqyE0GLQG8vLSwqbSKQ4Mz3Ght/oro6sDGCrfQ/2bF8ukVmSD8HM8QHNuOm9yUS+tuLYgD1slgerVlnTpX96L0ZPKLs1VuidOexGsXw1nrfbFfVKeVCWXBKs8EGsl7ta/O4MmVKyZgO3BSUfKVsZ8PmzCPxOgsuwQCS2rbGYT7MvtzSPBowkpbR8i/dqbEyz28YfEAxyniGDrZ4f2SNIr5LCXWN4FLkjVBogMK/SZ099De/j4S0i0+MgribBPllKq0u268mMqjvRmfgui76PEfwabDpf2q/T1pc9D93Vw2hkBJV/XaywTUx;4:ee+cyy+cMpCtQYacSa8L7hNEQTxTDznU5TfW9FnBrP40Add0bOG6f7cgm8ZCzbLed9kyCeWXjFxobXmSeL7MxpWCTYJkCbVQZNi67QQSCeq89UWDvXNmXVScbDuftVM3LnJhBmhRfehkpC7lrsnMB0QkgKFzw4sdS0bD6msqvI3rr4z9kzjroIR70qn6N+lCoxfK/YYzkNTNStk3pn86z1JMckknf+mlk+PR2qIaB5tiWk5HhQ7F8KWm1t2e6tfEajnM1hTG9fTt8uHtTOFmKQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(944501161)(10201501046)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(6072148)(201708071742011);SRVR:VI1PR0501MB2864;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:VI1PR0501MB2864; X-Forefront-PRVS: 0555EC8317 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(346002)(376002)(39380400002)(396003)(24454002)(199004)(189003)(53754006)(33656002)(229853002)(54906003)(86362001)(575784001)(4326008)(16586007)(83506002)(316002)(57986006)(122856001)(2906002)(106356001)(52116002)(105586002)(478600001)(7736002)(58126008)(76176011)(47776003)(8676002)(305945005)(53936002)(83796002)(9746002)(50466002)(6916009)(1076002)(26005)(6116002)(3846002)(36756003)(66066001)(46656002)(97736004)(68736007)(23726003)(9786002)(386003)(69596002)(6246003)(81156014)(5660300001)(8936002)(81166006)(2950100002)(18370500001)(24400500001)(42262002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0501MB2864;H:mlx.ziepe.ca;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR0501MB2864;23:u3pvmnDb2eFlGRw3VVvGJHZKKDBqGwWAZlgFULC?= =?us-ascii?Q?S+z87OEOft980cyb0T2GWtMlZq/KNxUgw8daIyvQwBFy3p821pLiMuJm3mxa?= =?us-ascii?Q?+1DO6H55gA6Td3gr7j60jnG2RuBna2lo0bKvNGHYfzXWrG2BTra5B8nQnhup?= =?us-ascii?Q?wZwtBPbp0uaTULuyAxQBmu9njUIWwRqpJKA3+jxvMMFDTMpL9P/5yAaztfw4?= =?us-ascii?Q?JqJAbLPeILb4ti5217F9N9n39bt6Tz+ov6pI7LDKJfsIDGVad86FhK5g0+La?= =?us-ascii?Q?d+JKY8J7QPHmSA6ZqdDsz8hfA7yntNVmjVOk4laufgjH/Mts1Q1tBQWXKUBs?= =?us-ascii?Q?YIYNJXfi1mHFtH2oAWr4ojqLlaJV7/v0UKvqdOkSBVuhaMX3QFgiopeuh8Ez?= =?us-ascii?Q?pnHpxmWucfhkiviqq/JX+G8t+f4UY2x/tNSVb9YyaL+D22XcTEzMrZBqZSat?= =?us-ascii?Q?ZTMKT1Ude01Ky/6K6EAvpczJG5T0Nsg82OLV3/LlvLAL1abJk0UUYNYhMRq1?= =?us-ascii?Q?dY0hNVglGn+aYkAoip81IU1dRLqWEGS/4LbuEJM2bdjrXPwqG/qmgrO1UpjA?= =?us-ascii?Q?BmKuxI/qv1Zn18KbAcSFrB8zRbxtbWP67C5DYh6UCfOsF57Jj6uOOG9Kurx+?= =?us-ascii?Q?tozfFjccIqouK25mVECdTFO1/laH+PgGiYdxZmCXINXhBHGh+KlsQPUhrqah?= =?us-ascii?Q?YyJSgdZF3Lnsf2IpBJhzD/mVmmxCgfRUftHMukUkoZm6tdLaVTO0irshbOzF?= =?us-ascii?Q?I+mKq6DEaCPBBH5nSjZXARFXE71nj9syCJm4GGiQoXkJjZKn7ODHy+S1nSHG?= =?us-ascii?Q?Zeh/8d0B/pKjRlZ4QInC2eq7Es3cADAXu5kWR2inrf5suoP9a4u0+uxVJ/FT?= =?us-ascii?Q?JrT6kMgdBODYXAsm/5J8MK2y7P+06qpMcoW5CT62+/Qs4H0UFeBQPXh328n+?= =?us-ascii?Q?qUX41j4kvlPwyxNxkhlFSas5cOt+OVUzl3ijLQqr2XLOCQrSnQ2vzxXH7IrO?= =?us-ascii?Q?gGkK/bSOuQD/PBmi87+jSM9fl4d3Gx18RYkRNJ8wdJOpVmjcd5nXSbwYRPwD?= =?us-ascii?Q?90+EFRpaVdxLpneG9qLbKblDa6ctoJa07iAc3eE1noxGhqvX3zm+rFeJKAaL?= =?us-ascii?Q?sweSpbVI31HGG9NtFzkePibSRbDOIuBQl9fSD0+Ax5yEpgV5leB3f2C54gBU?= =?us-ascii?Q?+e4JL+uump+uApxfIHT0M1n7rI1A/0JI/MWR57S/z84MZz5+kTHS0Jss5IMr?= =?us-ascii?Q?JMOfA38t5uuMtUloHVDLzJbiS6wkOQVpxtMLdCcL3TbHBUeTFj/zJbGma4U8?= =?us-ascii?Q?bIwVddceaXLuoMPd29i83OIerbmDs7oQRgKCIsLg3CFSVYwvsK920R4z0oVQ?= =?us-ascii?Q?NMhv6zA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0501MB2864;6:wfmYvtQCvnN1i5+ZmU186y4GcTDeRu2d8asc7TVd0wz6aoScwXd6ggmAA9qAyycFVywxrAZ+2SgUOeDt2MaB0chsUxQdVcBqV72yZ96S9eGXPvZYl8pUqbdCehssW3mHrQdivcljCRk5l9K+jCYhKhw+AjvX3bkAHeBVaudnomMomGZEphinYsow+LY2Qkr0vjYlNvxDy+XEFRW3OeLJkFEV+YPayKReqY3/AJFUBKTNesfLCeB+/k+raAm9BVGFviIsgJYgEK/2aajW9lf0Z+yU3Sm4JSpffXQAB85qhHzCi+7HywL/1u2X+zesIftHSB1HIM6dOugqpu4AaCw7080cxUCGSivmCs+mn1So6SU=;5:M2K2U2cmXpKYkRqvpOCsBFfaNJfjddTwNaeyCKA9Kpn8E0//bseX0a1bB9N1kjjEbz+bjr+bcDFg4GOeIASCUo+VjAMd1d7P7UooDykUMmfTia7npH5484tLoyURjPhijJQVYAPAmzuVgfml98Ss59/FSTXDo4UtjDKZqJnACY0=;24:P4GHKWRp+oUHLTDejjr6AuywQfr/vaehKV2FnAOkpfmXXUZJGELJmvuvwQ1n16+u99HVmmphrdiWKM5xUG37+xoqDsZJg64LL6XjyNW1Ux4=;7:fgdLTl+5QYPS2JiwAlO+q85XHtBRAuk2zlG7Uu/1EZP+4+FH95bJfbMT3SohVs2Mm1Dcm49cq9GdLEmysrgr8L2OYAssRL6O2kPyebBkqae5qx1STkH3KO1dW6PWC7fe2vZwj+5E1a0xUDx47azV28MGXAOS44cnsj3ZL2Lvvg58pHmVfibJzP4OC0sCL2C6onWh0uYqjtvsfCoGG8rIlBsjMdtWRGvAzb7nFEPbG+WJ1ChsNDE/fSRdb3kYzMXu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2018 03:03:46.5002 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57e9a3d0-7d06-46bc-e92e-08d55d56ecf7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2864 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Wed, Jan 17, 2018 at 12:55:37PM +1100, Stephen Rothwell wrote: > Hi all, > > On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell wrote: > > > > diff --cc drivers/infiniband/hw/mlx5/qp.c > > index cffe5966aef9,ae36db3d0deb..000000000000 > > +++ b/drivers/infiniband/hw/mlx5/qp.c > > @@@ -4361,12 -4674,12 +4674,11 @@@ static void to_rdma_ah_attr(struct mlx5 > > > > memset(ah_attr, 0, sizeof(*ah_attr)); > > > > - if (!path->port || path->port > MLX5_CAP_GEN(dev, num_ports)) > > - ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, path->port); > > - rdma_ah_set_port_num(ah_attr, path->port); > > - if (rdma_ah_get_port_num(ah_attr) == 0 || > > - rdma_ah_get_port_num(ah_attr) > ibdev->num_ports) > > ++ if (!path->port || path->port > ibdev->num_ports)) > > I fixed up the extra ')'. Sorry about that, Thanks, this looks correct to me, and the conflict was expected.. Jason