From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B4D6C28B2E for ; Tue, 11 Mar 2025 08:04:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CC7E3408EB; Tue, 11 Mar 2025 08:04:06 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Xxs-lWSvSOOt; Tue, 11 Mar 2025 08:04:06 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CD9314076D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1741680245; bh=hMeLmrfySK9HcB5JMfLT2WMRmznMQ67haaYLvUJji9M=; h=Date:To:Cc:References:From:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cmMOSX2V4Hsbk0A7YzeJdZpJwQBokRVlg9xOSzXRtTuLUqDWjpmYobuRcxm2mH7Xy WiMGsFhMOBC9DPgCYpjczK2eHqo/PAo966b4hjgk/5zjqNvkV3JwV9jip+i35VnEq2 82ZKow1by8LVjwrRmmZIsmTpp/bcN8Vo4mj/tR3nnY48PjdfDcWDlS7aClzgbcx+/V VVhQbr0DIIdP6nGA1KDjNeL1k3GbMlOdIfKs5wyiiOM39nsvpYS5PBvriKFZALtQR9 7p3C2EZLXDQ4fmQZVRobYsxP25FD4ABlhAqol4jv7Lcz4qK5PTh445PFAuHxijvVxH gOkwPbWraMBRg== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id CD9314076D; Tue, 11 Mar 2025 08:04:05 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id 80DD41DA for ; Tue, 11 Mar 2025 08:04:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6C2FF40569 for ; Tue, 11 Mar 2025 08:04:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id c03K9kabfv5Z for ; Tue, 11 Mar 2025 08:04:03 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=192.198.163.17; helo=mgamail.intel.com; envelope-from=faizal.abdul.rahim@linux.intel.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 520EF40B49 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 520EF40B49 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by smtp2.osuosl.org (Postfix) with ESMTPS id 520EF40B49 for ; Tue, 11 Mar 2025 08:04:03 +0000 (UTC) X-CSE-ConnectionGUID: v27/QgdBTvWpfQaiZHp/sA== X-CSE-MsgGUID: +Tjta4vaSSqYmRPikjpRDA== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="42578404" X-IronPort-AV: E=Sophos;i="6.14,238,1736841600"; d="scan'208";a="42578404" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 01:04:02 -0700 X-CSE-ConnectionGUID: /dr7UqHmQAqqV9hHUp+3Bg== X-CSE-MsgGUID: +NRjllwISn6ESt2MUCIVjw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,238,1736841600"; d="scan'208";a="125292705" Received: from mohdfai2-mobl.gar.corp.intel.com (HELO [10.247.64.210]) ([10.247.64.210]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2025 01:03:59 -0700 Message-ID: <5ebcf4b7-ed17-4cd6-ba1d-c35562a32899@linux.intel.com> Date: Tue, 11 Mar 2025 16:03:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Vladimir Oltean , Kurt Kanzenbach Cc: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sebastian Andrzej Siewior , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org References: <20250307150231.pc3dl4aavb2vdp7i@skbuf> Content-Language: en-US From: "Abdul Rahim, Faizal" In-Reply-To: <20250307150231.pc3dl4aavb2vdp7i@skbuf> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741680243; x=1773216243; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Wwj9xuWqFgi4/fNw7ALhUHz5l5PslVh8FksuTOaW3K4=; b=maBd35oxw3RseZGjeuYqe4YkGItRxBqPQePTyzjeHAfq2zoy6+jjHJOx DMt9uKpFzeeCA8onwWNpAZyKDmmbmEozrlVlgnlTKFjz3IGKkjefa7Q2z 2vCI7GD7Y6I6+Uk6u3RPcOaNvUurnsOd02FmG42QwVtPmX3RzJM2pMLcI RBYp02rBeGN8z28vz7Gw6YUTJHWAZcvbFmW2IR2rlxe/MN7bKSVZ5y1cT +WF8hiOMR+pRu9lFcNQ4dKK4MGbqGDIKLz2+7DJq7yUawrZfbAltwZPtM unNPq9xEJrrYcWsTlFMqvdGUFVUKiOKQjBO0TLU4tDmj7KfZzMIXH1dwo w==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=linux.intel.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=maBd35ox Subject: Re: [Intel-wired-lan] [PATCH iwl-next v3] igc: Change Tx mode for MQPRIO offloading X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On 7/3/2025 11:02 pm, Vladimir Oltean wrote: > On Mon, Mar 03, 2025 at 10:16:33AM +0100, Kurt Kanzenbach wrote: >> diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h >> index cd1d7b6c1782352094f6867a31b6958c929bbbf4..16d85bdf55a7e9c412c47acf727bca6bc7154c61 100644 >> --- a/drivers/net/ethernet/intel/igc/igc.h >> +++ b/drivers/net/ethernet/intel/igc/igc.h >> @@ -388,11 +388,9 @@ extern char igc_driver_name[]; >> #define IGC_FLAG_RX_LEGACY BIT(16) >> #define IGC_FLAG_TSN_QBV_ENABLED BIT(17) >> #define IGC_FLAG_TSN_QAV_ENABLED BIT(18) >> -#define IGC_FLAG_TSN_LEGACY_ENABLED BIT(19) >> >> #define IGC_FLAG_TSN_ANY_ENABLED \ >> - (IGC_FLAG_TSN_QBV_ENABLED | IGC_FLAG_TSN_QAV_ENABLED | \ >> - IGC_FLAG_TSN_LEGACY_ENABLED) >> + (IGC_FLAG_TSN_QBV_ENABLED | IGC_FLAG_TSN_QAV_ENABLED) > > How do you and Faizal plan to serialize your changes on these flags? > You delete IGC_FLAG_TSN_LEGACY_ENABLED and he adds > IGC_FLAG_TSN_PREEMPT_ENABLED. From what I’ve experienced before, when there’s a conflict like this, the Intel maintainer handles it and gets both authors to review the resolution (this has happened to both of us before) before they proceed to submit the patch. But if one patch gets merged first, the other person can just rebase and submit a new version ?