lkml.org 
[lkml]   [2024]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the mfd tree with the pci tree
    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
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2024-05-27 16:18    [W:2.537 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site