From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751761AbcAERG3 (ORCPT ); Tue, 5 Jan 2016 12:06:29 -0500 Received: from mail-am1on0085.outbound.protection.outlook.com ([157.56.112.85]:35609 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751104AbcAERGZ (ORCPT ); Tue, 5 Jan 2016 12:06:25 -0500 Authentication-Results: spf=pass (sender IP is 193.47.165.134) smtp.mailfrom=mellanox.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=mellanox.com; Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree To: Stephen Rothwell , Doug Ledford References: <20160105125154.36d9a0c4@canb.auug.org.au> CC: David Miller , , , , Saeed Mahameed , Achiad Shochat , Matan Barak , Leon Romanovsky From: Or Gerlitz Message-ID: <568BF7D4.8080304@mellanox.com> Date: Tue, 5 Jan 2016 19:05:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20160105125154.36d9a0c4@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.12.129.30] X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;DB3FFO11FD021;1:WSVoD9h4oG4Yx5O5NGShANeI3r4OngYUQTexVj6WQcx2+4cRmDPCecCoZw0LV0E1phQwH8dsksf9rsVFD2mFRwyLevvfJSiKz+RelHkF6ySjUhM0tlCioWEymyEBahvr8a+u26w88GVzyOqKjyd+N30/JgfSZfVeG1LDkLWH+XtO92X+wbbNXHP0oA3ZwKSXeOXrUb9bMGY24oTUzSWkRnzu0UUTRQc1NhBF8ja/4nSkPU9bJX8eHV8LIyR4pEFK2p91qKYFRJS94GTS3eQE1k/kQRt2wB/Usx4f0aePzRcB+OMhmX896Gv/UKrG19voUV6JlBcBywPrup07KyWMkQoTIRRCZ2Z8dU02pFHn2a0e3WLee+n5tX/lS6e9I34p X-Forefront-Antispam-Report: CIP:193.47.165.134;CTRY:IL;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(438002)(189002)(51884002)(24454002)(377454003)(479174004)(199003)(76176999)(80316001)(4326007)(86362001)(6806005)(65816999)(87266999)(4001430100002)(92566002)(83506001)(64126003)(50466002)(2950100001)(1220700001)(65806001)(50986999)(54356999)(4001350100001)(106466001)(65956001)(87936001)(23746002)(77096005)(189998001)(59896002)(33656002)(5004730100002)(5008740100001)(36756003)(11100500001)(47776003)(97736004)(230700001)(5001770100001)(3846002)(586003)(107886002)(1096002)(6116002)(3940600001);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR05MB1226;H:mtlcas13.mtl.com;FPR:;SPF:Pass;PTR:ErrorRetry;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB1226;2:fbAlp16Ugdg1tCkGI0Av/LMaQg80kHgUZ872x5j9hwn3qV9E0tbnW6RhQSRYsGc86lcvIUo/w3+7QvO5Wl1Cy0Tfn9stoIuIeM3AOs1PFf/BWFbafni/NlxjAt41AK8ZIIekpaehFiEMswbTwypJ4w==;3:wltKpBsIDOKzp/WQPh8bBglXBNmlU/pvingoHPigU4f/h8UmacQNZJk8yjdUTyu4H7JdB9/CRVU+vyCxZsOUtgsianVaW3gw4To1u9fcaNJRgon0Pj4GlynrVSv0J1F7yf5iQtgqsJ/u/Qi7xNLjqXKu3ZREqasU5HD+pwRDbbjSzTmaBHMppoL0QYr+dEkjQ7VquIvIQkM8BmiipB3qUXCzXfuFucxa43Ay9EjaSOIdEAIeN+ZzGi6Cw1cfToxvByBCZbFNjSmoYshV1jnYsg==;25:KcXoa/g+feCNDZB3O//7Cw8TawZBzajwaLJnLtuPy8wH4HI2hfCObm6dL+8NUlyYOtnlZJIE4+u0FVVj7CIoqhpRYPIXWh2YkwFh3Otw0L9STJoWaL1qBpbfTt4UdhDii9/ciKKctWP8493hHWvItZYwNhj7WMBZDfqEEzuyHY65WktjVVknQNFX8xsIFG2tvQehktd0uvLUmll77ktvbl4o6EDxSeCoXdI/z4XS+xPRN4I+brpzzDJHkp41WEWWTg5AzKpMkQ0RzlKM/zba2w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501001);SRVR:HE1PR05MB1226; X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB1226;20:dFzaWSfl+Z8jZF1E4dZkb2f7nO7hUqfQcjhfNgUzr47VlWi3LJitotGViLTgbryuV7C8ItwBvHtxcCh1OYWFebyrHmyXiUdg8/y92p41PLowDbK450ta6CSueW098sBuXk90J6LcCJwmL/LH3/qg403Frhlz8dwucU436Ps+8b84SulSDKlHHUWkJpG354OunLKrOUcxB39KfxsZg94whsaTP8IAsfl9cWUiJpM54BI071LOJ2pPbdDvwSHCD5cxxUu+rkb5jnyxCHWJebVTF+58TimvKrnVDHoMbtx/FTA5zyggv9ckXsgusXsEHs1NJmn0yyDlUg2sIKTNlVyIHoullso3GO6fR9SNaILpZgsnvSdJJ5rvnEUYGPQ9xN2c1FTtfr6tKaRAl7zz21GxKdmMXTwTGVkescSpfBM/2zbqLvRAc/jr/TmdGF9UNCyn8NRmwznKgQcY9ZGv1s0DVwk02RRKPNiesMXydRlu8wI/B2K0AlmR8M7f2J8szMhg;4:P78F1szal+71s6RYfScKpmNKZu1KtQWeO87TE4eEiI3gYzcuVbm37D9VVf8sm2SWrTgznXvDH5qm6iRF/Ue87rWur8JDiw57rh3F5Zq2X/S+g97NtElQsvnm8QLCifBoKQlgla+lm2pmaG/IbeZal6DLmONhiric/OOOccDYIAsRJFLq7Abo5st24KrXjqxvwDYUDP3B1vhIinY16r2UqaWqsvcVYaPE48cPr+AAWvLwlXuolW1pCNTn6KrTc4RvXnNRO1le2/P/YqHRZn1iu3ZGK50LnPhuBO7/rGKciEBPsKm8SyWXf4mUbSWUIMth/ejsyVQyZNuDSh9XzqhkbY0N1Im66sOO5crCoZj0oJg7a6O7455AF/F3NZT6zU5V X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001);SRVR:HE1PR05MB1226;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB1226; X-Forefront-PRVS: 0812095267 X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;HE1PR05MB1226;23:yguN79mlWQiR+ij9+ZQchH+0K7NSHkmLrF25K?= =?Windows-1252?Q?7X00ObL/Px4QmWmYaqanhlCCTCAST3qAX/vN4wV+J6vmjfzfZxSy8VVz?= =?Windows-1252?Q?1Nb1Q4I7Hx0p0UGXTW29QHMq5TeuGAsQ8PRDwe0t+rsht/tGcBvlkW82?= =?Windows-1252?Q?/9JVjvlYyb7q6c6GCOj2GapGmzLfcVhXOLNuUIy/uD9UyeW3nuLGtRBi?= =?Windows-1252?Q?cQnLOG3HbR78fIDb8+CWMnsmv40a5tJTJkX2J3R2vULiGWp980i5DW5j?= =?Windows-1252?Q?c+Xtz8YcL19VwYgj/DDAArkUEJIXu4agp+eLAA5w+eKmJ/oGMFPZOyND?= =?Windows-1252?Q?6rEgkUxpUNkTxU41xugjaipoaaId0x5EX7WAyk5DBqALp6jtyEKuoYEe?= =?Windows-1252?Q?N5AMq+0nw1+5fTiLKGCT5PNOquTt6j6mo5TiB1bGgvKVVosSCj0ggkEL?= =?Windows-1252?Q?h4UL2pMxMW9JXhAMzIDnvHOapjYHOqFafoJrd8DhPi2OHYGT3AJCmL6V?= =?Windows-1252?Q?5kHVyxiqp8EImHf/c+LFWycOboyMfW1eDy338sve0bKwSWgPbDyRiTIX?= =?Windows-1252?Q?qNHMYC7uz+h5/83C7GNfENc1kmaUzynG/XKyDhFnBDArQMmd+xbRRTwe?= =?Windows-1252?Q?Nr7wknq38nzATd8ANN2GJU0AjaaU7ihSbDeOJaOkPC/2VPkwTICyxo29?= =?Windows-1252?Q?RjuU6GnOWL9PgqrS4hDozfo5YfpOht82y0VWghc+C62Piv6kla9RdhQ3?= =?Windows-1252?Q?dPVZslQSP4OglEjaZBSaVBSBlYNPmq0sdaBu8f57vV9umbjNz9R06JQC?= =?Windows-1252?Q?EVfgb7/1HGSaDThfWDpQoaYqQuYzAiD0hnFsL8mqd0RbLKLlMAPn90fM?= =?Windows-1252?Q?N7bQvRqHim1cZ4LKd4ibbbkwzmj1i8ZnA7YSNDzGRdgIKV7zLFz0fw+E?= =?Windows-1252?Q?Qf/Mct8s2CR3AM72xyISy9C6+Wl8HIcAsbkdVq5H3FonmJzd44fnlf7K?= =?Windows-1252?Q?3NO6cB3CVPFeRJwg89qQJXan6+YrCsyF7/D8TOqjnrflS9ej0uo0UBm+?= =?Windows-1252?Q?uAC1Uwv66PSIi7w4CREFFPV8yczRWDYlqbF1cO5e8XXC996WeliYlhC9?= =?Windows-1252?Q?EpZRXW3bXPkD6Kd1QG7qT7NE9cnlHAhDR073z/M5e3roYBS/2ns3rU3f?= =?Windows-1252?Q?otskekR3aobisIobqtQeB6ccv1Azt+xlvi6Wxy4ge/FXLYX6GudnrcQV?= =?Windows-1252?Q?j3cZ8VcX5zB/hwgdyebhlVGZWDGyBAHu61Y37jY/Rt4jl81Nqo4gC4KX?= =?Windows-1252?Q?25Xxv6iln7fFMJZjDhtxFYk0lDNi9m3cs/R7NhQoYDCjBNKK4v0kTQif?= =?Windows-1252?Q?61wBsHCooe1?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB1226;5:Kzz+KlUHdcKEBYDtQUeM7gGeGH/7FM6J2ybtGyJ5GD7gWkCIgU68xawFNuctWdAOY/0Y5DGE802Proi2wtqoGwv66yh9o31m8Jxbe8Nd8B3sksbd2N+hVfGmu8Ekn6nv+lXm7ZnDiDZXU7ojPzpHbw==;24:0dteiT6eguXVvK2D6iq19q5EBilh8A1Ex/Bll5BaJVvwMxTDyJlDWglu77t6koEbfDP0LhHqWw87qhHCmktmamdPo44opYhk1bIJ0NL+hAk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2016 17:06:20.1538 (UTC) X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a652971c-7d2e-4d9b-a6a4-d149256f461b;Ip=[193.47.165.134];Helo=[mtlcas13.mtl.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1226 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/5/2016 3:51 AM, Stephen Rothwell wrote: > Hi Doug, > > Today's linux-next merge of the rdma tree got conflicts in: > > drivers/net/ethernet/mellanox/mlx5/core/vport.c > include/linux/mlx5/mlx5_ifc.h > include/linux/mlx5/vport.h > > between commits: > > e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address") > e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state") > > from the net-next tree and commit: > > e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function") > > from the rdma tree and maybe some others. > > I have no hope of fixing this stuff up, so I have dropped the rdma tree > again for today. There is similar functionality being introduced in > both trees ... please sort this mess out ... Hi Stephen, Saeed/Matan and Co are working here on a fix which would solve the conflict. We have the basic patch and people will be testing it later/tomorrow. Could you please advice how would it be possible to provide you the git rerere output -- the pre-image and post-images files from .git/rr-cache? Or.