[lkml]   [2012]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the pci tree with the powerpc tree
    Hi Jesse,

    Today's linux-next merge of the pci tree got a conflict in
    arch/powerpc/platforms/iseries/pci.c between commit 8ee3e0d69623
    ("powerpc: Remove the main legacy iSerie platform code") from the powerpc
    tree and commit 673c97562489 ("powerpc/PCI: replace pci_probe_only with
    pci_flags") from the pci tree.

    The former removed the file, so I did that.

    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-03-09 02:35    [W:0.023 / U:2.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site