1. 20 Jun, 2013 38 commits
  2. 19 Jun, 2013 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d98cae64
      David S. Miller authored
      Conflicts:
      	drivers/net/wireless/ath/ath9k/Kconfig
      	drivers/net/xen-netback/netback.c
      	net/batman-adv/bat_iv_ogm.c
      	net/wireless/nl80211.c
      
      The ath9k Kconfig conflict was a change of a Kconfig option name right
      next to the deletion of another option.
      
      The xen-netback conflict was overlapping changes involving the
      handling of the notify list in xen_netbk_rx_action().
      
      Batman conflict resolution provided by Antonio Quartulli, basically
      keep everything in both conflict hunks.
      
      The nl80211 conflict is a little more involved.  In 'net' we added a
      dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
      Linus reported.  Meanwhile in 'net-next' the handlers were converted
      to use pre and post doit handlers which use a flag to determine
      whether to hold the RTNL mutex around the operation.
      
      However, the dump handlers to not use this logic.  Instead they have
      to explicitly do the locking.  There were apparent bugs in the
      conversion of nl80211_dump_wiphy() in that we were not dropping the
      RTNL mutex in all the return paths, and it seems we very much should
      be doing so.  So I fixed that whilst handling the overlapping changes.
      
      To simplify the initial returns, I take the RTNL mutex after we try
      to allocate 'tb'.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d98cae64
    • John W. Linville's avatar
      Merge branch 'master' of... · 4067c666
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      4067c666