Messages in this thread | | | Date | Mon, 14 Dec 2015 11:27:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the pci tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/pci_ids.h
between commit:
a755e169031d ("PCI: Add Netronome vendor and device IDs")
from the pci tree and commit:
2d1e0254ef83 ("pci_ids: add Netronome Systems vendor")
from the net-next tree.
I fixed it up (the former was just a superset of the latter, so I used that) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |