* linux-next: manual merge of the mfd tree with the pci tree
@ 2024-04-02 0:31 Stephen Rothwell
2024-04-02 14:00 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-04-02 0:31 UTC (permalink / raw)
To: Lee Jones, Bjorn Helgaas, Lorenzo Pieralisi,
Krzysztof Wilczyński
Cc: Andy Shevchenko, Damien Le Moal, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 755 bytes --]
Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
drivers/mfd/intel-lpss-pci.c
between commit:
5133224938b9 ("mfd: intel-lpss: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY")
from the pci tree and commit:
e42199bf13d4 ("mfd: intel-lpss: Switch over to MSI interrupts")
from the mfd tree.
I fixed it up (I just used the latter) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the mfd tree with the pci tree
2024-04-02 0:31 linux-next: manual merge of the mfd tree with the pci tree Stephen Rothwell
@ 2024-04-02 14:00 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2024-04-02 14:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Lee Jones, Bjorn Helgaas, Lorenzo Pieralisi,
Krzysztof Wilczyński, Damien Le Moal,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Apr 02, 2024 at 11:31:16AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/mfd/intel-lpss-pci.c
>
> between commit:
>
> 5133224938b9 ("mfd: intel-lpss: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY")
>
> from the pci tree and commit:
>
> e42199bf13d4 ("mfd: intel-lpss: Switch over to MSI interrupts")
>
> from the mfd tree.
>
> I fixed it up (I just used the latter)
This is correct fix, thank you!
> 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.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-02 14:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-02 0:31 linux-next: manual merge of the mfd tree with the pci tree Stephen Rothwell
2024-04-02 14:00 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox