Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2017-08-01 10:07:50 -07:00
commit 29fda25a2d
537 changed files with 11723 additions and 5156 deletions

View file

@ -476,7 +476,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
int i;
for (i = 0; i < nr_irqs; i++, res++)
if (!of_irq_to_resource(dev, i, res))
if (of_irq_to_resource(dev, i, res) <= 0)
break;
return i;