mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Saeed Mahameed <saeedm@nvidia.com>
To: "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
	"tglx@linutronix.de" <tglx@linutronix.de>,
	"mingo@kernel.org" <mingo@kernel.org>,
	"sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
	"leon@kernel.org" <leon@kernel.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"x86@kernel.org" <x86@kernel.org>
Subject: Re: [GIT pull] irq/core for v5.17-rc1
Date: Thu, 13 Jan 2022 19:31:06 +0000	[thread overview]
Message-ID: <dc342ecda69fab39d754c0ba71ae1ca472320611.camel@nvidia.com> (raw)
In-Reply-To: <CAHk-=whvPxG2Sje_OBSeDODiD68ke+ta118xeYskNxkv-kAtyA@mail.gmail.com>

On Thu, 2022-01-13 at 09:01 -0800, Linus Torvalds wrote:
> On Thu, Jan 13, 2022 at 2:13 AM Thomas Gleixner <tglx@linutronix.de>
> wrote:
> > 
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-
> > core-2022-01-13
> 
> Hmm.
> 
> I got a conflict in the mlx driver. It looked trivial, but just to
> make sure I compared against the resolution in linux-next.
> 
> My conflict resolution is different, though, and I think mine is the
> correct one (although maybe they end up both being fine).
> 
> But I'm just about to leave for travel, and maybe I'm wrong, so I
> just
> wanted to people to verify...

Both will end up the same since mask is NULL.
Bon Voyage!

> 
> It's
> 
>    drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
> 
> and in particular the 'err_xa' release part of mlx5_irq_alloc() - I
> made it use irq_update_affinity_hint() to match the irq_release()
> paths.
> 

Agreed, code symmetry is an important standard in mlx5 ! Thanks!.


  reply	other threads:[~2022-01-13 19:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13 10:13 Thomas Gleixner
2022-01-13 10:13 ` [GIT pull] irq/msi " Thomas Gleixner
2022-01-13 17:16   ` pr-tracker-bot
2022-01-13 10:13 ` [GIT pull] timers/core " Thomas Gleixner
2022-01-13 17:16   ` pr-tracker-bot
2022-01-13 17:01 ` [GIT pull] irq/core " Linus Torvalds
2022-01-13 19:31   ` Saeed Mahameed [this message]
2022-01-13 17:03 ` pr-tracker-bot

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=dc342ecda69fab39d754c0ba71ae1ca472320611.camel@nvidia.com \
    --to=saeedm@nvidia.com \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /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

Powered by JetHome