From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Ingo Molnar <mingo@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nitesh Narayan Lal <nitesh@redhat•com>,
Saeed Mahameed <saeedm@nvidia•com>, Shay Drory <shayd@nvidia•com>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Mon, 10 Jan 2022 12:12:05 +1100 [thread overview]
Message-ID: <20220110121205.1bf54032@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
between commit:
5256a46bf538 ("net/mlx5: Introduce control IRQ request API")
30c6afa735db ("net/mlx5: Move affinity assignment into irq_request")
from the net-next tree and commits:
7451e9ea8e20 ("net/mlx5: Use irq_set_affinity_and_hint()")
0422fe2666ae ("Merge branch 'linus' into irq/core, to fix conflict")
from the tip tree.
I fixed it up (I think, see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
index 90fec0649ef5,fd7a671eda33..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@@ -236,10 -244,6 +236,10 @@@ struct mlx5_irq *mlx5_irq_alloc(struct
err = -ENOMEM;
goto err_cpumask;
}
+ if (affinity) {
+ cpumask_copy(irq->mask, affinity);
- irq_set_affinity_hint(irq->irqn, irq->mask);
++ irq_set_affinity_and_hint(irq->irqn, irq->mask);
+ }
irq->pool = pool;
irq->refcount = 1;
irq->index = i;
@@@ -251,7 -255,6 +251,7 @@@
}
return irq;
err_xa:
- irq_set_affinity_hint(irq->irqn, NULL);
++ irq_set_affinity_and_hint(irq->irqn, NULL);
free_cpumask_var(irq->mask);
err_cpumask:
free_irq(irq->irqn, &irq->nh);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-01-10 1:12 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 1:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-22 1:42 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2025-07-29 23:21 ` Stephen Rothwell
2025-07-04 6:28 Stephen Rothwell
2025-05-07 2:49 Stephen Rothwell
2025-05-07 6:06 ` Jiri Slaby
2025-05-28 6:13 ` Stephen Rothwell
2025-02-28 4:43 Stephen Rothwell
2025-02-28 21:45 ` Jakub Kicinski
2025-03-26 5:01 ` Stephen Rothwell
2022-03-15 2:13 Stephen Rothwell
2019-10-18 2:31 Stephen Rothwell
2019-10-18 5:00 ` Alexei Starovoitov
2019-02-15 2:20 Stephen Rothwell
2017-11-01 7:15 Stephen Rothwell
2017-11-01 8:18 ` Peter Zijlstra
2017-11-01 8:27 ` Ingo Molnar
2017-11-01 8:55 ` Peter Zijlstra
2017-11-01 9:04 ` Ingo Molnar
2017-11-01 10:57 ` Stephen Rothwell
2017-11-01 7:10 Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13 6:00 ` Stephen Rothwell
2017-08-31 3:47 Stephen Rothwell
2017-09-05 0:05 ` Stephen Rothwell
2017-02-20 1:22 Stephen Rothwell
2017-02-20 9:02 ` Daniel Borkmann
2016-12-12 2:30 Stephen Rothwell
2016-12-01 3:46 Stephen Rothwell
2016-11-17 3:04 Stephen Rothwell
2015-04-07 7:11 Stephen Rothwell
2015-04-07 7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2015-04-07 7:04 Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07 7:00 Stephen Rothwell
2015-04-07 7:30 ` Daniel Borkmann
2014-07-25 4:38 Stephen Rothwell
2014-05-05 4:29 Stephen Rothwell
2014-01-13 3:18 Stephen Rothwell
2014-01-13 3:20 ` Stephen Rothwell
2014-01-14 3:02 ` Stephen Rothwell
2014-01-14 4:51 ` H. Peter Anvin
2014-01-14 5:19 ` Stephen Rothwell
2014-01-14 5:19 ` David Miller
2014-01-14 5:44 ` Stephen Rothwell
2014-01-14 5:48 ` David Miller
2014-01-14 6:10 ` Stephen Rothwell
2013-11-08 4:58 Stephen Rothwell
2013-04-11 4:03 Stephen Rothwell
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=20220110121205.1bf54032@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nitesh@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=saeedm@nvidia$(echo .)com \
--cc=shayd@nvidia$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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