From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2076.outbound.protection.outlook.com [40.107.223.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E24B8C1F; Wed, 3 Jul 2024 06:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.76 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989979; cv=fail; b=TrG2JIwwJ3b4BGbwu8SEFzM7b7QzDbdo4V9g5WwkSO4VXWbwnci+9+6buZz6hlh80ZxmoCech2rVAQdJY9fp78B2ywDomx4nVf2+TBCBUwWGCxKU9LRF0xin7ZMfkVG7j227xFTLbsDY0cZTFbOqI+JMF4eH1ZHExc82Ss3OdMQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989979; c=relaxed/simple; bh=Sc+5FZp7Y1Zvj3AZnYXl0AUiLw0NFUCJgNO77VJA1ww=; h=Message-ID:Date:Subject:To:Cc:References:From:In-Reply-To: Content-Type:MIME-Version; b=IU0nGFnfwKPYPOoTNMrYasIZhrA4Sb+rrWcPnXHrIIdGalxaaqNJG5XqHT8snY6YuUn/hOKFOR57nZESQ/cslspc8UDldHlMmwuS1o1ZB9FJIZtQ9itpnItg1PRYLTjgf6OdcHBTngrKtMgNtrfj/fztredVnstvaYaAFFqJu/4= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=gL0pP1+t; arc=fail smtp.client-ip=40.107.223.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="gL0pP1+t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FYngsU1gHRsFeGlw1rCvdADh3vsZ2nO2wTUkLtD73iB2gG7HjMMU+jdmn11s1Qp2tTifC05ErCSnVjFm6d53hUKLXgbJKDS+gaLweasUCyK80qrlE414wAtXXdRHqBjqYSAg2BWWAJOlrxtmsgkI/hd70xDzKirM7Pv/VytiRo/OOHu3cE3LbNuNmQZ7QjU5vzzz/TLTnziinQR4eRlkHzQhmwv8T/cmWc0DozewXEdCo2tl0UCExlmkQVLTStlMfliCUcJe3kvD+osKu6/izV+SnSp16zmazDJejLJ9hcn2Vd5VeEZDi6+zy0QNoNOiU97SjWq+4puatu5mYGzfzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NTFJgOhgUeQtiQ8Y9k5m2lzv2b3Prpp9MhOzTp8CWLo=; b=F45FJS4sOakJjmcPs+lceAYSQ+OBugUHYa/vfS/2KwnNmYI1WksKmD2WUmdVrexqGAFP9k/q5eGjw2OTZoxA7Gv14ADUvYp9AvI5GCO/tjNLDlCnKrHiEV3srhu2vSx50fjkLB6YrZYsz6C7U/8EZhEc+N4QKkJTQfJRzY1FPtRERU62gboqnhhaFP6rlT3zTTLJ/tuMTEi3uqxbko76rGtTEzh2mtO0qaod8T2BQmf40AGQbnfQA25sy82R/MZMERCas6UceqjCtHahdDnG4+FtfGOlBjBluyWbIGcKL4f0g7w4MByRdeubGwQDNJUkeLXWnZDyFKOV8Xc/xEpCuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NTFJgOhgUeQtiQ8Y9k5m2lzv2b3Prpp9MhOzTp8CWLo=; b=gL0pP1+tHkSI1X0WpXB3fRrexWs+tS4v3cmEGY5bZ+lx3fYUzgPnK1uxMioorQURhLg+fx0BUzxM3FjCrh2Sfxux5XjQOLdjXLqBT4vF0uTheRoft8sKIr/BT7JgTg4GJhO7qExiDthGQHSm3z/Ni/CiEBM+1/J6toWHiEvwX4JX/6rVBS7uhxGU/4q/4DUFnIhV57k1C9P7Jp1asU+vacye0hBenUrEIWaTw7la3c5R7vxGkIDlUFmLzZGjSJNyp3QScEtdO0Z/rarY7T+dg2tJbB0jlLDU2iEibO3GpsLXo+h62q5mMsWOYRQoxaoWffNnnSRkOJIp4ynf854ocA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from IA1PR12MB6018.namprd12.prod.outlook.com (2603:10b6:208:3d6::6) by PH7PR12MB8828.namprd12.prod.outlook.com (2603:10b6:510:26b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.36; Wed, 3 Jul 2024 06:59:32 +0000 Received: from IA1PR12MB6018.namprd12.prod.outlook.com ([fe80::c3b8:acf3:53a1:e0ed]) by IA1PR12MB6018.namprd12.prod.outlook.com ([fe80::c3b8:acf3:53a1:e0ed%5]) with mapi id 15.20.7741.017; Wed, 3 Jul 2024 06:59:32 +0000 Message-ID: <2982021c-7627-4cfe-9979-d13e7d371986@nvidia.com> Date: Wed, 3 Jul 2024 09:59:24 +0300 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell , David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Daniel Jurgens , Linux Kernel Mailing List , Linux Next Mailing List , Yoray Zack References: <20240701133951.6926b2e3@canb.auug.org.au> Content-Language: en-US From: Tariq Toukan In-Reply-To: <20240701133951.6926b2e3@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO4P302CA0008.GBRP302.PROD.OUTLOOK.COM (2603:10a6:600:2c2::16) To IA1PR12MB6018.namprd12.prod.outlook.com (2603:10b6:208:3d6::6) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR12MB6018:EE_|PH7PR12MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d35c981-40b6-4014-64b3-08dc9b2db09c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QndBQWpZWVJva0dpR0dsWENiV0hnVnJrUmJHeU1WWnMxYThpK2hrOElQSXRH?= =?utf-8?B?UkhFMFpKVU45UWwrQTJib3hGUXJsR0lQU3NtaGR4RVRMZkhIYk1nVk5vR2ZH?= =?utf-8?B?NFR3UWxhVnlVSFhHU0FodVZpcXdGQ0t3QUt0N2djbG50NkVENkdzdDlXZk1I?= =?utf-8?B?KzNrcllGSWpmNjVxQ0ZtMHBhc1FienczcnBRdkxHRDBSQ0kvWG5OS01TMXNB?= =?utf-8?B?YStnNStTR2VtUHE3cDlOblpWTTIrUWo4YzBVTVFQc2tTSHg3TUhwNUNxU0VD?= =?utf-8?B?cTg1TDBha3VNNlh6aXNWdFdUYklBMXdkRDVCTVV5a3Evb2hBOGFOWGkxVUJ1?= =?utf-8?B?bDJlczYwRzdNQWFPQUhVZUxQMW9oU0hKSG1oOTM1SUkxbWxNd2p2Z2cwUFc0?= =?utf-8?B?VmRsQTVzUHVDVFp2MlByL2U5ZWt4d3VaUjNoZEdOdGVhS1Y3cWk1SEw1azJ5?= =?utf-8?B?eDE1MVRYWTlnOSs3K2dwTFQ2enZ1NXhsNTgwTWFtRkFFYm1EQyt0Q3hmSnNo?= =?utf-8?B?OHRkVUZ4TDdoTGNuRVJCYi9MaDVBM0UvTU84VjYxU3FGZklwblNTSzVEMzl4?= =?utf-8?B?NVBzU01sbHJsb1g5Z0FVQVlGRjRCWG5pSkdycjJ1NmdtMmxXKzFnN29JUmdL?= =?utf-8?B?ZkFLMHNTZ1hUcjZMUU5mYjZtMGtjd2RnVlhJNks1VDcyNlpnOUtBUzltTU9h?= =?utf-8?B?a0k5eCt5OXZkUEc1Qmg4WWRIVG45SjhtR2ZGRVhXVXEvOVNWc3JNaTd1SmFP?= =?utf-8?B?Y2Yvck93Q0J0SldaZjRKcExYa2pkaUdlZ2loMElzQjBTY2NZeC80UVJnQTU1?= =?utf-8?B?YTBnSkZaeTdMUUdlQVh2ejlJdktCTXQ1am5sKzByQ0R3UUprMW5vREIwWm1H?= =?utf-8?B?UEQ4Y0Vnd0l2VWViRFpjVXh3ZUNJQTI1U3pPQkEya2EzV3FNSzJJQVIxMUxm?= =?utf-8?B?em1RMWFBTTVzOWRLQ3RERjE4WHJOY2xLbTVmOGJNck5pYStnalBVRXcxMWZM?= =?utf-8?B?cGNVKzhGMUNvdVUycy9VZ0plcWt2cUNodHd3a1k2b2gvMEtDVEVJNjFjcTdr?= =?utf-8?B?NGlxZ05vZEs4WjFXN2MzY2xoWlBDNlNHNi9DU1dlMlNhWE4vQk12SmYrTjNK?= =?utf-8?B?VUxVVlBzR200UE9QZVR4ZmVGMk8rQklFMzFqVHpReThiaEg3RDA2cnFteXNH?= =?utf-8?B?SVVuVVpnYXRkR0JHY0RhMjNkZE0zUTgyeWEvd210dDhHZkhwQWt2V2JKWkQw?= =?utf-8?B?Z3NEYjdQQk0zczduNkYwOU9QZVkrUVJ0cUQzSFdFamZuaTJ4Ui82UVVMcUh3?= =?utf-8?B?WmRtQS9FUUxpb0ZYZUgzYnRqa1FsdHAxS211TkVud3V4WnlXLzB0T0J6RWVV?= =?utf-8?B?d3hON29LQVhCNGJBU1UvZjUvaVU0V0N6bGFMSnpheVFJZjdmNzlqVlZBWGx4?= =?utf-8?B?TTh6TDM0bCtKQ2ViRUpwVDZoUXZTdTZLTVNXVE11WGQ1WExpdDJvc0ExckhV?= =?utf-8?B?alE3Qm1CYURZLzNwWCtKQkNCZUdxT3UwVko2aENSQVVNWGJTM2dSekVVT0Mr?= =?utf-8?B?bXNnOU5TTmtiVTdveGNIbG4welJpYW94YzIxVDdVa1lESDQ5c0ZFZXVjL3Zy?= =?utf-8?B?dHJwVGNBdC9qYWtrUnlFYkxpaW1JUCtCSjE5V3M3bnRSaUZVTSsyQ0tRWjhC?= =?utf-8?B?a0RuTDBxeTgrWVJUZEEyZDZWeTArc3NKRWZrWTRiRlBYaVh5QzhMK2lzcnIw?= =?utf-8?B?SnVNK3N1QjdaQ2RuUlk1bUo3bnp2b3NkeDVkSWRBSVVySDFKbWx2emZWeXpO?= =?utf-8?B?cW5xaTFOVys3Wng1c3NXdz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA1PR12MB6018.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NjdSU01GZC9lSnVXemZzejRhakdReHBJSHNicFgyTGFOYjhRNUYzcFo4TGpY?= =?utf-8?B?YU05clVTTmZOeTZtaEhhVUlIQWFNMnZLd0pwNDdrbUFjK3BhTk5ubUxGckFa?= =?utf-8?B?eDB0UzNORkE4ZmdKSnJIK3ZVZGd6UDllR0crOEx1eUpnSHFMWlFGMFpjb1ov?= =?utf-8?B?TjR2ZUFRa2ZKVnV1TlJWUUY0Sm12Nk9lVER2dEc1QndRRnZ5ZkNpTE8za3JE?= =?utf-8?B?Y2o0UzFZYk8wVnhQV09DNDlzWXR0cUtKZ0RXZjlRMVRuamxsRnowc3N6QVVL?= =?utf-8?B?WjdRMkc3c2VqczlkUWorOU1IYUowdVczb1hZZ0szQzB0RmxKa2YyUEhQamMr?= =?utf-8?B?ekZ3eXRkaHNlaWVNSHdIS3BieEl5UXpucHBzVlA3U3hiWmV0d0tvcGt6eFRM?= =?utf-8?B?NkRBOGRDMEptZXc3Q0NIdnI3ajRkYlFSN2JFVWlSUUlGRDdkdlhRTzQ0blFQ?= =?utf-8?B?Y0RmOE11OG1RS3hiQzBOTHJuajV3bUtMZVd5NnF5Vno1T0tuQVd0WFQ3eXAy?= =?utf-8?B?YThFcU5GTXJUeEFoYnY5YWZSQlR6YVI2enhaTWEvZlMxc0VWQVhEcUVucmJB?= =?utf-8?B?ZXlCSVhjUERic0RrRkRGMUxTK04vc0Q1TUZ5OGpKZDVxVE52a1g4cnM1c2hG?= =?utf-8?B?TWFoc05jeUdTV0JkcUNnVDk0NnU0SG14d01CQWdzenZVUzhqT1dvMXZPZ1pD?= =?utf-8?B?cEUxZVJJb05PUCtaa0QzekdIVGR4WGFXYVhLcFB0OThheStRdmZEU3FhSWgv?= =?utf-8?B?VjluSGVOcGYzWTlDamlQYVdHWXhsZERnQTVjWVJXdmdNSzBRRnhRUEt4WHU5?= =?utf-8?B?d0U0V0IxZkZ4dHpxL2w1MklwSnVmdnI4M3d1OE1TaDRwYmlNT1R5ZWIxYlNm?= =?utf-8?B?YUFzOWFTbWZjUVJLUTdUQmdHQTlpelFaaGRzWGdyL3JQamdObkMwcDRoTVMr?= =?utf-8?B?bWRCMHFSZDVXSlJRbm1jaGtBTFo3M0VVZUtSVlFOVU1IbisyR0x0VHRVTkJT?= =?utf-8?B?VlR4akorS3FlTXY2cXM2d2Q2NlZxNGJCQXJaUkN0dWtZTVlMRjZ1ZE9US1Ay?= =?utf-8?B?WkpoV2RkNHEzdm8wMTJuSzlkVElNT2VRekVtd1ZEelM1UXAyN2gwYmVXTmV3?= =?utf-8?B?NHRTOUhxb2pEZ0V0NDJiVXhqWFhVU3hqNGxsK1Azc3FJMk1OSkE5SE01NkNC?= =?utf-8?B?RjdWT0x2ak44VVJNSzh4WjhyOHpFb1lTK21FUWpMMDlTcnlDV0tkNXY0aE9Z?= =?utf-8?B?L0ZTRWtqRTVSQzR2SzBRZHlQYU90cUxwdzd3ZVJERGdoTDlUZk1OK3BybjVB?= =?utf-8?B?UlhoSFlCeENIZXFQTWRGMFo2OGJrejQ4TVJsVU52dytmOFdSM2JoQ1hsOFJ2?= =?utf-8?B?Uk1yb1l1VHdIZHBPdUMyeldsY2RIWU95MXd3WmtKMDJrMWJGN0RLaC85ZWk1?= =?utf-8?B?aGJlaDdsSng2Z2dRTkF4d3ZQc3NKT3RMaVlwWGJubnQvNDV6TGVjcm10V0R3?= =?utf-8?B?cnRaUjBJL1RMZUh5VHVmRWJCcExDUllOUDlwRXlTblVWWDExM0dBN2ZCNy9H?= =?utf-8?B?QThsQ1ZZZHlOSXA2YlFWOEhVNFg4ZUtvM0NuUWVJZ0krdVdGWGRkWmNEMlVo?= =?utf-8?B?WnJPdkdsUzJ6YWp5YmVINnJ4Z2JpWXJrV0dVcnJXTzFZKytiQ1pyS1p4enpa?= =?utf-8?B?QTZqYi9IbERNSjlpaDJpQkRaTFJLUWtRcXB0K0ZUZnozakZMUHlVMmVsMjlC?= =?utf-8?B?VVhLV1ZlODY0K1pNSzgrYkVGYXNOTS84T0c2RnFRb01YWDlmNnNGdVR4UDd2?= =?utf-8?B?Wm0wUzNSYjJuRHFpZjFxek0ybCtxYit3c1lxd2xBemZUWmpBUnpvU2xBRUFC?= =?utf-8?B?Ym1kVlpsMUxLZmdXemRyRWVCMThITExRWGRzWTdUVVFBTlpBdEp4WTN6aWVC?= =?utf-8?B?alFCQ3d1OHFxeDd5YXlWV2piN1RReGZ3TXMxdjBjSTRRVXVYblF4UGowTWxu?= =?utf-8?B?WFNqeGlqeHJ6VUhSWU0yUzVPRDUvS1JZZHFYdi8vbUhUYUZkNjFmSGlXa25P?= =?utf-8?B?bm9zTUNDMXRSQ21VbXQ1aTFUa0d1eE1jZnhzUlNpVWtpaW00QlFnU1VUZ1hN?= =?utf-8?Q?w+MRtZQO74PHqMo21sHDVwjEh?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d35c981-40b6-4014-64b3-08dc9b2db09c X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6018.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2024 06:59:32.0872 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ecM9r2WhwStZMVhmC24hmWWoaHCMr2MvTvbMeIxpruVMFLfeCtOTEl9aiYvKg20QW+XV7S7O2kOfatcXnWCp5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8828 On 01/07/2024 6:39, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 048a403648fc ("net/mlx5: IFC updates for changing max EQs") > > from the net tree and commit: > > 99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO") > > from the net-next tree. > > I fixed it up (I think, see below) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. > Hi, Thanks for handling this and sorry for the inconvenience. I noticed this and replied on the list a few days ago: https://www.spinics.net/lists/netdev/msg1009210.html Regards, Tariq