linux-kernel - linux-next: manual merge of the net-next tree with the net 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 for Android: free password hash cracker in your pocket

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

Date:	Sat, 2 Feb 2013 14:22:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Neil Horman <nhorman@...driver.com>,
	Stephen Hemminger <stephen@...workplumber.org>
Subject: linux-next: manual merge of the net-next tree with the net tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/vmxnet3/vmxnet3_drv.c between commit 6cdd20c380eb ("vmxnet3:
set carrier state properly on probe") from the net tree and commit
204a6e659439 ("vmxnet3: use netdev_ printk wrappers") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
index 12c6440,b1c90f8..0000000
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@@ -152,9 -148,10 +148,9 @@@ vmxnet3_check_link(struct vmxnet3_adapt
  
  	adapter->link_speed = ret >> 16;
  	if (ret & 1) { /* Link is up. */
- 		printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
- 		       adapter->netdev->name, adapter->link_speed);
+ 		netdev_info(adapter->netdev, "NIC Link is Up %d Mbps\n",
+ 			    adapter->link_speed);
 -		if (!netif_carrier_ok(adapter->netdev))
 -			netif_carrier_on(adapter->netdev);
 +		netif_carrier_on(adapter->netdev);
  
  		if (affectTxQueue) {
  			for (i = 0; i < adapter->num_tx_queues; i++)
@@@ -162,9 -159,9 +158,8 @@@
  						 adapter);
  		}
  	} else {
- 		printk(KERN_INFO "%s: NIC Link is Down\n",
- 		       adapter->netdev->name);
+ 		netdev_info(adapter->netdev, "NIC Link is Down\n");
 -		if (netif_carrier_ok(adapter->netdev))
 -			netif_carrier_off(adapter->netdev);
 +		netif_carrier_off(adapter->netdev);
  
  		if (affectTxQueue) {
  			for (i = 0; i < adapter->num_tx_queues; i++)

Content of type "application/pgp-signature" skipped