From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Oct 2015 02:54:45 +0000 (-0700)
Subject: Merge branch 'hsi-fixes'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4639a3b522f1acec462896f1770523f380fe0157;p=linux-beck.git

Merge branch 'hsi-fixes'

huangdaode says:

====================
net: hisilicon fix some bugs in HNS drivers

This patchset fixes the two bugs in HNS driver, one is remove the hnae sysfs interface
according to the review comments from Arnd Bergmann <arnd@arndb.de>, another
is fixing the wrong mac_id judgement bug which is found during internal tests.

change log:
v3:
 remove the hnae sysfs interface.

v2:
  1) remove first bug fix, which is fixed in another patch submitted by
     Arnd Bergmann <arnd@arndb.de>
  2) change the code sytyle according to Joe.

v1:
 initial version.
====================

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

4639a3b522f1acec462896f1770523f380fe0157