Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Sun, 7 Apr 2013 22:37:01 +0000 (18:37 -0400)]
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

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

26 files changed:
1  2 
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/mwifiex/cfg80211.c
include/linux/netdevice.h
include/linux/skbuff.h
net/bluetooth/af_bluetooth.c
net/caif/caif_socket.c
net/core/dev.c
net/ipv4/devinet.c
net/ipv6/netfilter/ip6t_NPT.c
net/ipv6/tcp_ipv6.c
net/iucv/af_iucv.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/offchannel.c
net/netfilter/nf_conntrack_standalone.c
net/nfc/llcp/llcp.c
net/nfc/llcp/sock.c
net/unix/af_unix.c
net/vmw_vsock/vmci_transport.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -13481,17 -13437,11 +13481,11 @@@ static void bnx2x_check_kr2_wa(struct l
  {
        struct bnx2x *bp = params->bp;
        u16 base_page, next_page, not_kr2_device, lane;
-       int sigdet = bnx2x_warpcore_get_sigdet(phy, params);
-       if (!sigdet) {
-               if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE))
-                       bnx2x_kr2_recovery(params, vars, phy);
-               return;
-       }
+       int sigdet;
  
        /* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery
 -       * since some switches tend to reinit the AN process and clear the
 -       * advertised BP/NP after ~2 seconds causing the KR2 to be disabled
 +       * Since some switches tend to reinit the AN process and clear the
 +       * the advertised BP/NP after ~2 seconds causing the KR2 to be disabled
         * and recovered many times
         */
        if (vars->check_kr2_recovery_cnt > 0) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge