linux-kernel - Re: linux-next: manual merge of the net-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1387331769.2330.12.camel@jtkirshe-mobl>
Date:	Tue, 17 Dec 2013 17:56:09 -0800
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jesse Brandeburg <jesse.brandeburg@...el.com>,
	Anjali Singhai Jain <anjali.singhai@...el.com>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree

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++) {

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)