From: "Abdul Rahim, Faizal" <faizal.abdul.rahim@linux.intel.com>
To: Vladimir Oltean <vladimir.oltean@nxp.com>,
Kurt Kanzenbach <kurt@linutronix.de>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org
Subject: Re: [Intel-wired-lan] [PATCH iwl-next v3] igc: Change Tx mode for MQPRIO offloading
Date: Tue, 11 Mar 2025 16:03:57 +0800 [thread overview]
Message-ID: <5ebcf4b7-ed17-4cd6-ba1d-c35562a32899@linux.intel.com> (raw)
In-Reply-To: <20250307150231.pc3dl4aavb2vdp7i@skbuf>
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 ?
next prev parent reply other threads:[~2025-03-11 8:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-03 9:16 [Intel-wired-lan] [PATCH iwl-next v3] igc: Change Tx mode for MQPRIO offloading Kurt Kanzenbach
2025-03-03 9:22 ` Abdul Rahim, Faizal
2025-03-04 17:30 ` Simon Horman
2025-03-05 8:16 ` Kurt Kanzenbach
2025-03-07 15:02 ` Vladimir Oltean
2025-03-11 8:03 ` Abdul Rahim, Faizal [this message]
2025-03-13 13:39 ` Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5ebcf4b7-ed17-4cd6-ba1d-c35562a32899@linux.intel.com \
--to=faizal.abdul.rahim@linux.intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=anthony.l.nguyen@intel.com \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox