From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934816AbcALLr6 (ORCPT ); Tue, 12 Jan 2016 06:47:58 -0500 Received: from mail-am1on0064.outbound.protection.outlook.com ([157.56.112.64]:58688 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933627AbcALLrz (ORCPT ); Tue, 12 Jan 2016 06:47:55 -0500 X-Greylist: delayed 9376 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Jan 2016 06:47:54 EST Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Date: Tue, 12 Jan 2016 11:12:33 +0200 From: Ido Schimmel To: Stephen Rothwell CC: David Miller , , , , Jiri Pirko Subject: Re: linux-next: manual merge of the net-next tree with the nettree Message-ID: <20160112091233.GB12607@colbert.idosch.org> References: <20160112131507.4509e7bf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20160112131507.4509e7bf@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [149.78.144.178] X-ClientProxiedBy: VI1PR07CA0115.eurprd07.prod.outlook.com (25.165.229.169) To HE1PR05MB0985.eurprd05.prod.outlook.com (25.161.115.12) X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB0985;2:ySOWSA32rwX0EOImXBVD+YQkcnW0+wPoOz4dA8th8SK49xurpy/KrCj67oZogTNEBh3umKeofZU9Ym++t4PoVSQrZV5a8UQrDcuXXc67lTYYBKZN8rroiuyLMlEvnWl/6hqjffycTU85m/NQKV0YjA==;3:MQFom4fXIsC/rQt8GeM+WXuM+3c2vIlWgYcofHSnLmVd2OkRarZD54JyDKasTl7uO+4sZJBQCq8D90uEo5RvwHCWujcNne4ajwgJBbO03DRckpXFa0RB5D/jTOACfiQ5;25:rN/ExfW//g+HwV566CuKynTirUXpblW4d0CZf917mi8D1B93q099Vvt7pd5yIUlZxf6RwF5uR5gSJJJ14A80ylxKelSqe6Wv2LAo2coBtb37UuoqHCOjgNXYYsRxLviw2FKRd5uFsjSJjCJP6ZmuAjLdsyoM25aoFZD7/67JlSDkNsZiRDu3g6kCQ2RmZow1sKQKN/+GDjG8tl5iuk/O5zZcKnkoKxjt/NRAc+tESwq43i4ASaywkquU59p3Znvw X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB0985; X-MS-Office365-Filtering-Correlation-Id: a93ff826-0be9-4f7d-5f65-08d31b309d48 X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB0985;20:iLB5vLKUa7kra8llFkxcxIc8rmp9LFFqXNPXMU4z04q644qLbxIS8u7unZ90/bLn77Y/wMVSJ63rXzeC3TGJfc4HV/9GU9qm11WrsndAcP+afWwoKXDBrg190RgUSNY2AXK2V6mM5AEAhvQrvQ8M22qNfAfdiDh10ony1etECCmXsSYEZ7m6Y3IEZH3V/H544S/gM5SvDgyq0bbP+TU5zQbj0fJWkvli9E+ZlAt8wXmhbP7ZlHBkwvQct/VR5FJjegcdnHQj3+WWuT8pEGatFqUWLLkM++zoNG2+BUocvRko5cVE3K/SxhCPMUX//3DcKJAr05xNtg10keMp08UbTXk2fOWR+E4VaFNDu7JFs5e5CCiiOfJ94cr+mhYNSfCUD14610h6pAetaTLpkrbSE+VjmJhY+ezCxhOwDhypuYLzxfPlqj2nrPgcSfSO7+XmGs9mdl90Raq0zYnC5WGgYn3EZrG/sbTLOND5UD+gJZEbI+1M89hhYvYLYkua6aeM;4:Gco74OSARQozgHcmNcGljhhfLESZKUSAvkWY1OpSwR1P1D3fd3JZYr+xmTolOEz55r+jq0QytC3s2xeuWlST0G1jLuHOLrz17SGg/0M39s7cOV6Rv8XNQbgP4pOZK2dB5rN7t0USgkX6xPjIMhZE/rkeu3tPvU+YL2vr/EMDHtWsxU/d6t6Gfh2xEzd1vwCCyjQBYUPFNplAgKLsAodVE3h6TQbpQ/5Bdz7VlRwQbqAKyjdW9LdE95veq1trMLEsTwLdbESkAa7qel/65iwDRJLwc8hP+rI55zPl779RPh13+X6MPwkcEIk4BwgksPd/LCpfLWbIkiL7BnOpgq8XruZAZw5tGaAVJRYbLeHIn1GbABG7ciX39RIjro/KicZcw0X7rhWcpvNm4SZ/aj9QDVtq0Y22ie6mr4M4gRWMZUU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(34787635062028); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(3002001)(10201501046);SRVR:HE1PR05MB0985;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB0985; X-Forefront-PRVS: 081904387B X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(53754006)(189002)(24454002)(199003)(189998001)(50986999)(122386002)(87976001)(110136002)(4001350100001)(3846002)(86362001)(107886002)(5004730100002)(47776003)(50466002)(76176999)(66066001)(46406003)(81156007)(105586002)(19580395003)(54356999)(83506001)(5001960100002)(1076002)(42186005)(40100003)(33656002)(6116002)(76506005)(2906002)(97736004)(101416001)(2950100001)(23726003)(92566002)(77096005)(1096002)(4001430100002)(106356001)(586003)(5008740100001)(4326007)(97756001)(19580405001);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR05MB0985;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR05MB0985;23:rGggL9S1XdB+Wq1oBBoL0n70F97uPtjI7JNL6vRmo?= =?us-ascii?Q?Jd2SrpEL4wf6C0smae1ooCgoZWs1J0SYl8WgmwSkmturI/6rqNMtQNxOi0Yp?= =?us-ascii?Q?EkJvg8G4lwAuHwxWvMN/tVsEkCewElusO3YorexVY0x3H8DnRqrfRI/Bl2M7?= =?us-ascii?Q?Yj86XGa5xiOCDwr3i5iwGMfIkw8e64NNbKQeiyUSfvZdnC3aBNkllL4cpIUk?= =?us-ascii?Q?U0hp15IxCHRLVK+0zBS0VzYMtti36TG4MG5ihVxE50bnCQltcsaQ4Q4huI+e?= =?us-ascii?Q?NsW89UvDcjLGihGUcZ1eD/Y7R0wGsamAOUukfoAbv9rB9MkxZw2TU3hYUwG/?= =?us-ascii?Q?Ls0tmJRYBGsE27V3PqjyZ9JUaXGp9n79vCoK3l9gj5a+nQ4Yday07Mcoy3NV?= =?us-ascii?Q?50nsLxOiY6DOVAq0xCjcB5nUbHQcKG3bJwj3+CgLKKgxbf50/jyGzl+MQB92?= =?us-ascii?Q?/M5BJk1136asH18QVtZKb3mqYhOeHGy8Do4EZYKUt6jiucGiGsAnB3mb2gTC?= =?us-ascii?Q?F6qtg2E1i1veQPlYrES4aW4kY5awwpjJygWlSWSqHR7MhB2fTzlhozxNA0+c?= =?us-ascii?Q?b0yg+PAjC31hFNVTJFrTObScRnwa24nfvO4v1WA2016QNekzs2pLpSpKM/s1?= =?us-ascii?Q?6SPOnEZYQ+8D5LpFLwfJO2e+rkvLNKghZvS98DS1/Pz3oxti3GIrQirJpNe2?= =?us-ascii?Q?18oPYXtl1labDg/yUhpUSZixBWxv4YMycJ5HGE8oHZvRIztyn6IK+CehT793?= =?us-ascii?Q?nCjx/Hue/dl3lmmQi8Eyp3CrG1kt1F5AmI3SE58SepHoDpuMNXMGZd/IWW7b?= =?us-ascii?Q?HikNIycueSnVq1BxE/D9kEj1UmFXjFawGKnh8QoEXOpKY0TZn0Al2WpIWulF?= =?us-ascii?Q?p7ap7qlDi0Zb+ZRZ3+LM3z/tBSiOVCQJydiuDrGZ+ZhWHy2nidZEMOEmN/Pk?= =?us-ascii?Q?QqK911XB3uCQyaLMdPb66tgPnGy/xcmzvCo6T6bcvYUKTG0Q2fNEKqwHru0e?= =?us-ascii?Q?BBpyUqebVrUqLC/0zGbdjWuLf0UJVD7+uItqL0sgi2RITwcLdN6XxunvNQXN?= =?us-ascii?Q?IQ9eJQHcQ+ppvJt8hfTybdL3l5mms0czRF418++x7dpa9sEVmJhITd5mIh/z?= =?us-ascii?Q?zJhjeiSRYoRbPWLlP+zi421du+lTtV3dIQq/rk68i/Lw3y7Y6nx9tBf+x0a3?= =?us-ascii?Q?tkzDV9+CtinApgqzlyIGUO6TFowYIBt/huhxYze03wBodRa55M8GksvhvP+A?= =?us-ascii?Q?caoQCHxhKZg/a7Y0U4=3D?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR05MB0985;5:dfitfAbxJ9A2yLDqJXONReG7LzAF4aVNYs0zwmFCqG+19RXtlwl/PxbwOE2OzftPxLEtGJRaDm6dKZnGSg3RU1jFtSjUYQMi56uSJ/xXZwstv7EKOP68fxE5gaQY6fT1EejNn7MLbLrbXMtTKNkjlQ==;24:8JbH8FzUXjuk0wnwN59f82eGRPI8Y+he4w2FI1A+fh7NK3R7OHHTFg7L8TjVd8/RwaMCD2kn/oBLyP6rMJENPf4rn6257hOaNLbxn+zuT6c= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2016 09:13:19.5205 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB0985 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@canb.auug.org.au wrote: >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum.h > >between commit: > > 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving") > >from the net tree and commit: > > 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave") > >from the net-next tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required). Acked-by: Ido Schimmel Thanks!