1. 07 Mar, 2016 30 commits
  2. 06 Mar, 2016 2 commits
    • Kalle Valo's avatar
      Merge 'net-next/master' · 89ef41bf
      Kalle Valo authored
      Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.
      89ef41bf
    • Kalle Valo's avatar
      Merge ath-next from ath.git · 89916cc9
      Kalle Valo authored
      ath.git patches for 4.6. Major changes:
      
      ath10k
      
      * dt: add bindings for ipq4019 wifi block
      * start adding support for qca4019 chip
      
      ath9k
      
      * add device ID for Toshiba WLM-20U2/GN-1080
      * allow more than one interface on DFS channels
      89916cc9
  3. 05 Mar, 2016 5 commits
  4. 04 Mar, 2016 3 commits
    • David S. Miller's avatar
      Merge tag 'rxrpc-rewrite-20160304' of... · 94f7153e
      David S. Miller authored
      Merge tag 'rxrpc-rewrite-20160304' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
      
      David Howells says:
      
      ====================
      RxRPC: Rewrite part 1
      
      Here's the first set of patches from my RxRPC rewrite, aimed at net-next.
      These do some clean ups and bug fixes.  Most of the changes are small, but
      there are a couple of bigger changes:
      
       (*) Convert call flag numbers and event numbers into enums.  Then rename
           the event numbers to all have _EV_ in their name to stop confusion.
           Fix one instance of an event bit being used instead of a flag bit.
      
       (*) A copy of the Rx protocol header is kept in the sk_buff private data.
           Keep this in host byte order rather than network byte order as it
           makes more sense.  A number of other fields then get converted into
           host byte order too.
      
           Conversion between host and network byte order is then done at the
           packet reception/generation stage.
      
      This is based on net-next/master
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      94f7153e
    • David S. Miller's avatar
      Merge branch 'DIV_ROUND_UP-uapi' · 3d1c6df8
      David S. Miller authored
      Nicolas Dichtel says:
      
      ====================
      uapi: consolidate DIV_ROUND_UP definition
      
      The inital goal was to consolidate ethtool.h uapi header. But I took the
      opportunity to remove all duplicate definitions of DIV_ROUND_UP.
      
      v3: add patch #2 and #3
      
      v2: split the patch
          define DIV_ROUND_UP in uapi
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3d1c6df8
    • Nicolas Dichtel's avatar
      ethtool.h: define INT_MAX for userland · 14e20379
      Nicolas Dichtel authored
      INT_MAX needs limits.h in userland.
      When ethtool.h is included by a userland app, we got the following error:
      
      .../usr/include/linux/ethtool.h: In function 'ethtool_validate_speed':
      .../usr/include/linux/ethtool.h:1471:18: error: 'INT_MAX' undeclared (first use in this function)
        return speed <= INT_MAX || speed == SPEED_UNKNOWN
                        ^
      
      Fixes: e02564ee ("ethtool: make validate_speed accept all speeds between 0 and INT_MAX")
      CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      14e20379