From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934639AbcALJ1K (ORCPT ); Tue, 12 Jan 2016 04:27:10 -0500 Received: from mail-db3on0061.outbound.protection.outlook.com ([157.55.234.61]:24247 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933627AbcALJ06 (ORCPT ); Tue, 12 Jan 2016 04:26:58 -0500 X-Greylist: delayed 809 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Jan 2016 04:26:56 EST Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Date: Tue, 12 Jan 2016 11:11:02 +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 net tree Message-ID: <20160112091102.GA12607@colbert.idosch.org> References: <20160112131505.2228f559@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20160112131505.2228f559@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [149.78.144.178] X-ClientProxiedBy: DB4PR07CA001.eurprd07.prod.outlook.com (10.242.229.11) To AM2PR05MB0978.eurprd05.prod.outlook.com (25.161.234.140) X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0978;2:+lBKQj0AjCiePMSjS4emvKzWBBpLBUR5WvaV9tMzrOnBvsmNlj9Xb+Qka4y8qnirSzyIYEPmJsLHbD7p2jMjt0+8rh7I2CziulFau0IbNoIm9x45GtLvxXk+FgSIcO/J9y0H1OY9jPiEGXIuBLzvag==;3:TiOFsvpRvowMh1hcYsXmb3I7CY75zhsmeWeG+UawXFw/2E9KDTp/esYI2ntzWGlTmHYF1qD73hMiLpfw7BSuOayvzCYtulUUWLrceKJ/0I1FYPXeI6uDNX+i1xtgkKF4;25:OD8DMJZHnfEgR9jxvwZiQpQ0kZgdWJfYDKwFdMxVDSRjiM7dD67rUIi0MEno92R/zmZ4B3JbRe/ul9TBZPWJePoH3s6B2csZwE2J58Jgja0ag5Iq+GtE+pjRtPqc+gjctE8L/n1fprXqJK0lhS1rp3JZbHNZyDtb97zU9d/esyqonODktVDbuPqrLxbeAv7lftCoKJSMo8YBItr00M/UUJ8jxFXn5hu+VyfIQegn1pMRc84YkAvBgDmQCZNlTIdJ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR05MB0978; X-MS-Office365-Filtering-Correlation-Id: fa5503ba-90f6-473c-fc6c-08d31b305f46 X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0978;20:/jiI5FhNRRxuAutS9NmXuNX+6AvHVLzGw3b9kSUQoCyz/7STDDPoB/0rGnfseTSK2lJbSVsJniPrWIbd3OqA/R4rGKlNdjrfSW2TZIRm2BU4e7Cf1jMNbgz9XtNT+f8CHYb43sPEiAwX42re5txZSDFT4JLGi+XetU31/vmuItEnOj65dW24rLML5c68KQrklrCJnxaS4Co3sjPzAnNrU23pcNu7ear4E27OEBVQooyhPx9PU5qHppe+zyOcFgCpDh8u97K/EVJQGTDupyAA2gbT0fRjLgP7zdVSibIgeFkqlAJ2rXBHbp09v6gVbmjVz0/ChxgftEIlHiklI/SU2k6987qnvuSHI/Z4iyBpWjBOvnLRgbaCwtQdVsn7KMRsPxiDrhA4YaCZuR0buvW9PU+qkIG4y/LdTIgiPk6ymIoem2mu1AJCQT1apw/TNGp4v85LasjjNA41yskTnOydl6BCx/ynY5jpSSYAYx2YGMawyaWb1XpY6CdL+OmV2Hh2;4:l4aSUbVYPxmMcQ8Bj9zEQ9TrHlBnOmdR+WLYVJYOgKnEN/uFOgmbvCrkemLwy2u+M2E7SkjTD2KsPwy3sJlLju8B5HreIELfHpN5EuENFZPL0KUrsLTl3SoEQS8HmUNx4CaqDYROYxEOVFNDHSp/7iyJZnNvS8FAmum84Dj9NbLxC5cMMAy/OnozASaBZJHINxPmpXXn8EL1Azl5X2jkL0dkVSSE9U0lnFASEx/VY1piaDvR48rPOBvzqFPYh/drJayRMo6oLZSW96xN4U+cMbQwK/tviXdzZnpGmskQctJ1DjeR4Xt7joVS5EuIT/zxu+Z/3ClmFbTS9/VKNtpa3Tm19RegWebqgwdkVYx8Ml4HRn+4LS6QV4ZIk5i8G0sx 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)(3002001)(10201501046);SRVR:AM2PR05MB0978;BCL:0;PCL:0;RULEID:;SRVR:AM2PR05MB0978; X-Forefront-PRVS: 081904387B X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(6069001)(24454002)(189002)(53754006)(199003)(6116002)(1096002)(122386002)(19580405001)(19580395003)(101416001)(4326007)(50986999)(4001350100001)(54356999)(66066001)(76176999)(4001430100002)(83506001)(97756001)(97736004)(77096005)(2950100001)(110136002)(5004730100002)(87976001)(189998001)(81156007)(5001960100002)(47776003)(107886002)(92566002)(3846002)(1076002)(33656002)(50466002)(105586002)(76506005)(40100003)(42186005)(23726003)(2906002)(86362001)(106356001)(5008740100001)(46406003)(586003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM2PR05MB0978;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM2PR05MB0978;23:vyMe6Ru3q7+3fLxI5t4AwWlsTEl5Ntkw5yQRA9kue?= =?us-ascii?Q?VImcWSjW3pLEUgC29vNUKRdD9IvvxtFfCH6TAG6WRGP3qehc37fX9OaATCaD?= =?us-ascii?Q?bViU+YsnKNnK0GSSijS0egzk6wcrpSd0gd7OB9fMII0ITK6zkqD3H2cpnCZ9?= =?us-ascii?Q?5Hl4mshB6sEOtBDqjpIC7rFSSULcZb/zloTIkq0YFpMCoZieS12Tlv5p1gCb?= =?us-ascii?Q?nEvdoYFNyjfAvPQ65VwQRyt/d7Y1MjxPKViYqx+crB6WZpdPO7MZW6VA+Y44?= =?us-ascii?Q?+SxRGMGrydZ4MxfGX+yJ+q6h6THEChl4taOX3Sq3lsG74BuSUjyqao854V3F?= =?us-ascii?Q?au+xx2xPlb8k++z+01efuU3ciiD5uNjNwoD1fFATAvGwjllm7gJ4bm2d3zIz?= =?us-ascii?Q?pasZy8nFecDFasq4ig3DNRugrmufLShldjR+h/MHmjPzn2iv8Atu8k3a5slh?= =?us-ascii?Q?6qtjQG7KhBceze751Xe2etVgeTKuItfecznyflhgsEtNdQmeupMkBOheS8vC?= =?us-ascii?Q?O44uVa28UaoG4TdzBWpgUbz/9AVj5Dpp6HJNJlVwd4ReOS7RcRpJ/NVL7tSG?= =?us-ascii?Q?kCQl5nvQHO7YwYDJhejgE2VJpt0v8nuf+7pEUVH27AbWyDPTU/MJfLMzdgmS?= =?us-ascii?Q?K4hzh5f+EAy9C70HSrVtpMx729WoKcSKNDML7xIizi6LGJ+CIKRxSMuJHNbw?= =?us-ascii?Q?EOJ2+wmDg6mbENoo/PyzurSUrnY3nPvJs8+P7Tr/FJPGtZtTC0xRTAtbaoPI?= =?us-ascii?Q?6LeYccHLTM21buFDBU1w1QLxcYnuZLia3A+Jxfr8f0Vmd16VikWdilsrkh1h?= =?us-ascii?Q?qVlHm8+dT6Nm3BHXVxh5GpI5q8Q5kam2BuHVdMVbyZX7cwiOSbweUMBSb3CI?= =?us-ascii?Q?qYthrsSYJIoaY6YxqKFP3Vz+wzoCeMYzAemsAwhq2p9es6/kxBbxPz3mvyho?= =?us-ascii?Q?1wXzggQosOsglEVbZF8kuMVzk1ZmK3avQXGoDkuWGrnuVbpyJ2/Fh3nJFRkx?= =?us-ascii?Q?0gHlDY6JHNfUFYuWt+CvF08kLx3J4Gj8vviFwIBL2OTJlvckx/DM83UfEvhf?= =?us-ascii?Q?IopwDxzYbVaP0MRD5/6TFvG5tCm5Xz85sLD+tVwnHFVtg6yDN1BJrYsE6jhQ?= =?us-ascii?Q?2j+FH9VBhuIlDr/fU3upC7MRA+5ifL1bwWaPWTWmMNg9zxMJL2FkSGn2O1/a?= =?us-ascii?Q?Jol7SqY5PLFF6jUxgoqsm1YAYSc/5rSfYh5xVYNm5TgkrXWabnkbgLlEfIfc?= =?us-ascii?Q?hC2LU9KYuy1cJgdEc4=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0978;5:2dil1DRoUPJQwEeHZRWH7uLRqAk68gbyo8nWJDnWiVg71KJsoKlsUTiRHrmuv95T11TstdB2M+wE/qSAvma3gjSOqNqrjN26itwOkJ9J2HVbqEYTMP8p/+qsyiGo6JhiKQLvJNuqZsuvCxC+MY9X3Q==;24:vZIX6rZAt+RuirdVCwiV6anUx+B9/12ChchVD5gU8Jl2SKRaNVLxzGBTJhap49dsPK2T382owsnLMNQodewsSszVclWtPI2JvZg/jfAmmUI= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2016 09:11:35.6489 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR05MB0978 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tue, Jan 12, 2016 at 04:15:05AM IST, sfr@canb.auug.org.au wrote: Hi Stephen, >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c > >between commit: > > 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving") > >from the net tree and commit: > > 54a732018d8e ("mlxsw: spectrum: Adjust switchdev ops for VLAN devices") > >from the net-next tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required). > >-- >Cheers, >Stephen Rothwell sfr@canb.auug.org.au > >diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >index 80e266063aee,4cdc18e72222..000000000000 >--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >@@@ -650,7 -1057,14 +1057,15 @@@ static int mlxsw_sp_port_fdb_dump(struc > if (!sfd_pl) > return -ENOMEM; > > + mutex_lock(&mlxsw_sp_port->mlxsw_sp->fdb_lock); The lock can be moved further down, just before mlxsw_reg_sfd_pack. Other than that everything looks fine. Thank you! >+ if (mlxsw_sp_port_is_vport(mlxsw_sp_port)) { >+ u16 tmp; >+ >+ tmp = mlxsw_sp_vport_vfid_get(mlxsw_sp_port); >+ vport_fid = mlxsw_sp_vfid_to_fid(tmp); >+ vport_vid = mlxsw_sp_vport_vid_get(mlxsw_sp_port); >+ } >+ > mlxsw_reg_sfd_pack(sfd_pl, MLXSW_REG_SFD_OP_QUERY_DUMP, 0); > do { > mlxsw_reg_sfd_num_rec_set(sfd_pl, MLXSW_REG_SFD_REC_MAX_COUNT); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ido Schimmel Subject: Re: linux-next: manual merge of the net-next tree with the net tree Date: Tue, 12 Jan 2016 11:11:02 +0200 Message-ID: <20160112091102.GA12607@colbert.idosch.org> References: <20160112131505.2228f559@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Received: from mail-db3on0061.outbound.protection.outlook.com ([157.55.234.61]:24247 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933627AbcALJ06 (ORCPT ); Tue, 12 Jan 2016 04:26:58 -0500 Content-Disposition: inline In-Reply-To: <20160112131505.2228f559@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko Tue, Jan 12, 2016 at 04:15:05AM IST, sfr@canb.auug.org.au wrote: Hi Stephen, >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c > >between commit: > > 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving") > >from the net tree and commit: > > 54a732018d8e ("mlxsw: spectrum: Adjust switchdev ops for VLAN devices") > >from the net-next tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required). > >-- >Cheers, >Stephen Rothwell sfr@canb.auug.org.au > >diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >index 80e266063aee,4cdc18e72222..000000000000 >--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c >@@@ -650,7 -1057,14 +1057,15 @@@ static int mlxsw_sp_port_fdb_dump(struc > if (!sfd_pl) > return -ENOMEM; > > + mutex_lock(&mlxsw_sp_port->mlxsw_sp->fdb_lock); The lock can be moved further down, just before mlxsw_reg_sfd_pack. Other than that everything looks fine. Thank you! >+ if (mlxsw_sp_port_is_vport(mlxsw_sp_port)) { >+ u16 tmp; >+ >+ tmp = mlxsw_sp_vport_vfid_get(mlxsw_sp_port); >+ vport_fid = mlxsw_sp_vfid_to_fid(tmp); >+ vport_vid = mlxsw_sp_vport_vid_get(mlxsw_sp_port); >+ } >+ > mlxsw_reg_sfd_pack(sfd_pl, MLXSW_REG_SFD_OP_QUERY_DUMP, 0); > do { > mlxsw_reg_sfd_num_rec_set(sfd_pl, MLXSW_REG_SFD_REC_MAX_COUNT);