1. 03 7月, 2016 37 次提交
  2. 02 7月, 2016 3 次提交
    • D
      Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge · 3ea00443
      David S. Miller 提交于
      Simon Wunderlich says:
      
      ====================
      This feature patchset includes the following changes:
      
       - two patches with minimal clean up work by Antonio Quartulli and
         Simon Wunderlich
      
       - eight patches of B.A.T.M.A.N. V, API and documentation clean
         up work, by Antonio Quartulli and Marek Lindner
      
       - Andrew Lunn fixed the skb priority adoption when forwarding
         fragmented packets (two patches)
      
       - Multicast optimization support is now enabled for bridges which
         comes with some protocol updates, by Linus Luessing
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3ea00443
    • D
      Merge branch 'hns-next' · ca9354a1
      David S. Miller 提交于
      Yisen Zhuang says:
      
      ====================
      net: hns: fix the typo of hns
      
      This series includes typo fixes which review by Andy, adding
      the hns maintainer to MAINTAINERS, as below:
      
       > from Daode: adds the maintainer for hns driver;
      
       > from Daode: fix the typo of hns reviewed by Andy Shevchenko;
      
       > from Kejian: one remove redundant function and two fix to get
      configuration from DT.
      
      changlog:
       v2 -> v3:
        match all files in and below drivers/net/ethernet/hisilicon/
      
       v1 -> v2:
        fix the indentations reviewed by David.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ca9354a1
    • K
      net: hns: get reset registers from DT · b15dc292
      Kejian Yan 提交于
      Since the registers of subctrl may be different, it is better to
      mv the registers from hns mdio driver routine to device tree node.
      Signed-off-by: NKejian Yan <yankejian@huawei.com>
      Signed-off-by: NYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b15dc292