On Wed, 2013-12-18 at 12:46 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/i40e/i40e_main.c between commit 3c325ced6aef
> ("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
> ("i40e: reinit flow for the main VSI") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Your fix is fine, what I have in my tree is the following, so if you
want to modify your change so that the resultant code looks like this:

        struct rtnl_link_stats64 *vsi_stats =
i40e_get_vsi_stats_struct(vsi);
        int i;
  
        if (test_bit(__I40E_DOWN, &vsi->state))
               return stats;

        if (!vsi->tx_rings)
               return stats;
  
        rcu_read_lock();
        for (i = 0; i < vsi->num_queue_pairs; i++) {