Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-dev.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-main.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/Kconfig
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/cnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc include/linux/mlx4/device.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/mcast.c
index 64919425f1abf3a17df5be25e1ceb52143aeb044,a23b655a7627a69046d956139946c00dda8825f4..6833dd07b2c22f2f118feb09297f1f0d799634ee
--- 1/net/ipv6/mcast.c
--- 2/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@@ -917,8 -928,10 +929,10 @@@ int __ipv6_dev_mc_dec(struct inet6_dev 
  {
        struct ifmcaddr6 *ma, **map;
  
+       ASSERT_RTNL();
+ 
        write_lock_bh(&idev->lock);
 -      for (map = &idev->mc_list; (ma=*map) != NULL; map = &ma->next) {
 +      for (map = &idev->mc_list; (ma = *map) != NULL; map = &ma->next) {
                if (ipv6_addr_equal(&ma->mca_addr, addr)) {
                        if (--ma->mca_users == 0) {
                                *map = ma->next;