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

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

diff --cc Documentation/devicetree/bindings/net/fsl-fec.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/82571.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index ce81ce0698b30a5e182aa936942db2db6d8fe1eb,41e32257a4e873e37d4daf24798400c394416b69..2dc78d7e297ae4749d9fa5be1caa69cdfab8ea7d
--- 1/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
--- 2/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@@ -193,12 -201,15 +193,15 @@@ static bool ixgbevf_clean_tx_irq(struc
        unsigned int i, eop, count = 0;
        unsigned int total_bytes = 0, total_packets = 0;
  
+       if (test_bit(__IXGBEVF_DOWN, &adapter->state))
+               return true;
+ 
        i = tx_ring->next_to_clean;
        eop = tx_ring->tx_buffer_info[i].next_to_watch;
 -      eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
 +      eop_desc = IXGBEVF_TX_DESC(tx_ring, eop);
  
        while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
 -             (count < tx_ring->work_limit)) {
 +             (count < tx_ring->count)) {
                bool cleaned = false;
                rmb(); /* read buffer_info after eop_desc */
                /* eop could change between read and DD-check */

diff --cc drivers/scsi/bnx2i/bnx2i.h
Simple merge

diff --cc drivers/scsi/bnx2i/bnx2i_hwi.c
Simple merge

diff --cc drivers/scsi/bnx2i/bnx2i_iscsi.c
Simple merge

diff --cc net/caif/caif_dev.c
Simple merge

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

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

diff --cc net/sctp/input.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge