Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Conflicts:

	drivers/uwb/wlp/eda.c

diff --combined drivers/uwb/wlp/eda.c
index 0b4659e4bbd756feca105c1cec1e27204d0cfdb6,10985fa233ccfc038e66abc5e5fad9cbe8362e4e..69e020039718aed4711849b0b9fee3c80dfea866
--- 1/drivers/uwb/wlp/eda.c
--- 2/drivers/uwb/wlp/eda.c
+++ b/drivers/uwb/wlp/eda.c
@@@ -51,7 -51,9 +51,7 @@@
   * the tag and address of the transmitting neighbor.
   */
  
 -#define D_LOCAL 5
  #include <linux/netdevice.h>
 -#include <linux/uwb/debug.h>
  #include <linux/etherdevice.h>
  #include <linux/wlp.h>
  #include "wlp-internal.h"
@@@ -302,6 -304,7 +302,6 @@@ int wlp_eda_for_virtual(struct wlp_eda 
  {
        int result = 0;
        struct wlp *wlp = container_of(eda, struct wlp, eda);
 -      struct device *dev = &wlp->rc->uwb_dev.dev;
        struct wlp_eda_node *itr;
        unsigned long flags;
        int found = 0;
@@@ -310,14 -313,26 +310,14 @@@
        list_for_each_entry(itr, &eda->cache, list_node) {
                if (!memcmp(itr->virt_addr, virt_addr,
                           sizeof(itr->virt_addr))) {
 -                      d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x "
 -                             "wss %p tag 0x%02x state %u\n",
 -                             virt_addr,
 -                             itr->dev_addr.data[1],
 -                             itr->dev_addr.data[0], itr->wss,
 -                             itr->tag, itr->state);
                        result = (*function)(wlp, itr, priv);
                        *dev_addr = itr->dev_addr;
                        found = 1;
                        break;
 -              } else
 -                      d_printf(6, dev, "EDA: looking for %pM against %pM miss\n",
 -                               virt_addr, itr->virt_addr);
 +              }
        }
 -      if (!found) {
 -              if (printk_ratelimit())
 -                      dev_err(dev, "EDA: Eth addr %pM not found.\n",
 -                              virt_addr);
 +      if (!found)
                result = -ENODEV;
 -      }
        spin_unlock_irqrestore(&eda->lock, flags);
        return result;
  }
@@@ -351,19 -366,13 +351,13 @@@ ssize_t wlp_eda_show(struct wlp *wlp, c
                           "tag state virt_addr\n");
        list_for_each_entry(entry, &eda->cache, list_node) {
                result += scnprintf(buf + result, PAGE_SIZE - result,
-                                   "%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x "
-                                   "%p 0x%02x %s "
-                                   "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                   entry->eth_addr[0], entry->eth_addr[1],
-                                   entry->eth_addr[2], entry->eth_addr[3],
-                                   entry->eth_addr[4], entry->eth_addr[5],
+                                   "%pM %02x:%02x %p 0x%02x %s %pM\n",
+                                   entry->eth_addr,
                                    entry->dev_addr.data[1],
                                    entry->dev_addr.data[0], entry->wss,
                                    entry->tag,
                                    wlp_wss_connect_state_str(entry->state),
-                                   entry->virt_addr[0], entry->virt_addr[1],
-                                   entry->virt_addr[2], entry->virt_addr[3],
-                                   entry->virt_addr[4], entry->virt_addr[5]);
+                                   entry->virt_addr);
                if (result >= PAGE_SIZE)
                        break;
        }