Messages in this thread | | | From | Linus Torvalds <> | Date | Thu, 13 Jan 2022 09:01:23 -0800 | Subject | Re: [GIT pull] irq/core for v5.17-rc1 |
| |
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...
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.
Maybe irq_set_affinity_hint() is equivalent when the new hint is NULL?
Linus
| |