lkml.org 
[lkml]   [2010]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the net tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflicts in
drivers/net/qlge/qlge_ethtool.c and drivers/net/qlge/qlge_main.c between
commit ae9540f75d5a69e7604cc5391cc0726b3aa82ff6 ("drivers/net/qlge: Use
netif_printk helpers") from the net tree and commit
3ad2f3fbb961429d2aa627465ae4829758bc7e07 ("tree-wide: Assorted spelling
fixes") from the trivial tree.

I fixed them up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/net/qlge/qlge_ethtool.c
index 4f26afe,b8d21ab..0000000
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@@ -404,9 -401,9 +404,9 @@@ static int ql_set_wol(struct net_devic
if (!qdev->wol) {
u32 wol = 0;
status = ql_mb_wol_mode(qdev, wol);
- QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
- (status == 0) ? "cleared successfully" : "clear failed",
- wol, qdev->ndev->name);
+ netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n",
- status == 0 ? "cleared sucessfully" : "clear failed",
++ status == 0 ? "cleared successfully" : "clear failed",
+ wol);
}

return 0;
diff --cc drivers/net/qlge/qlge_main.c
index 2c052ca,a35845b..0000000
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@@ -3863,10 -3516,9 +3863,10 @@@ int ql_wol(struct ql_adapter *qdev
if (qdev->wol) {
wol |= MB_WOL_MODE_ON;
status = ql_mb_wol_mode(qdev, wol);
- QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
- (status == 0) ? "Successfully set" : "Failed", wol,
- qdev->ndev->name);
+ netif_err(qdev, drv, qdev->ndev,
+ "WOL %s (wol code 0x%x) on %s\n",
- (status == 0) ? "Sucessfully set" : "Failed",
++ (status == 0) ? "Successfully set" : "Failed",
+ wol, qdev->ndev->name);
}

return status;


\
 
 \ /
  Last update: 2010-02-16 04:53    [W:0.025 / U:0.588 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site