Re: [GIT pull] irq/core for v5.17-rc1

From: Saeed Mahameed
Date: Thu Jan 13 2022 - 14:31:14 EST


On Thu, 2022-01-13 at 09:01 -0800, Linus Torvalds wrote:
> On Thu, Jan 13, 2022 at 2:13 AM Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 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!.