Merge branch 'x86/urgent' into x86/apic

Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 3cee84a24815..93dc10b10c09 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1131,11 +1131,13 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
         lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");
         mac_address = of_get_mac_address(ofdev->dev.of_node);
 
-        if (mac_address)
+        if (mac_address) {
                 /* Set the MAC address. */
                 memcpy(ndev->dev_addr, mac_address, ETH_ALEN);
-        else
-                dev_warn(dev, "No MAC address found\n");
+        } else {
+                dev_warn(dev, "No MAC address found, using random\n");
+                eth_hw_addr_random(ndev);
+        }
 
         /* Clear the Tx CSR's in case this is a restart */
         __raw_writel(0, lp->base_addr + XEL_TSR_OFFSET);