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

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 3cf9faa6cc3f..a85d863d4a44 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -992,11 +992,12 @@ static int davinci_spi_probe(struct platform_device *pdev)
                 goto free_master;
         }
 
-        dspi->irq = platform_get_irq(pdev, 0);
-        if (dspi->irq <= 0) {
+        ret = platform_get_irq(pdev, 0);
+        if (ret == 0)
                 ret = -EINVAL;
+        if (ret < 0)
                 goto free_master;
-        }
+        dspi->irq = ret;
 
         ret = devm_request_threaded_irq(&pdev->dev, dspi->irq, davinci_spi_irq,
                                 dummy_thread_fn, 0, dev_name(&pdev->dev), dspi);