On Tue, Mar 11, 2025 at 04:03:57PM +0800, Abdul Rahim, Faizal wrote:
> On 7/3/2025 11:02 pm, Vladimir Oltean wrote:
> > 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 ?

Yes, rebasing after the other's patch is merged works just fine. I was
asking if you had decided which one should go in first just to avoid any
ambiguity, but if the answer is 'any', that is also fine.

Reply via email to