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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Wed, 11 Nov 2009 15:33:02 +1100
From:	Stephen Rothwell <>
To:	Dominik Brodowski <>
	Julia Lawall <>,
	"John W. Linville" <>
Subject: linux-next: manual merge of the pcmcia tree with the wireless tree

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/wireless/ray_cs.c between commit
40cca2919c1994c01addfac2320ee77f4b9e12cf ("drivers/net/wireless: correct
check on CCS_START_NETWORK") from the wireless tree and commit
624dd66957e53e15cf40e937b50597c4d41f0e99 ("pcmcia: use dynamic debug
infrastructure, deprecate CS_CHECK (ray-cs.c)") from the pcmcia tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
Stephen Rothwell          

diff --cc drivers/net/wireless/ray_cs.c
index 5ee9d2a,28db791..0000000
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@@ -2074,8 -2065,8 +2065,8 @@@ static irqreturn_t ray_interrupt(int ir
  				local->timer.expires = jiffies + HZ * 5;
  				local-> = (long)local;
 -				if (status == CCS_START_NETWORK) {
 +				if (cmd == CCS_START_NETWORK) {
- 					DEBUG(0,
+ 					dev_dbg(&link->dev,
  					      "ray_cs interrupt network \"%s\" start failed\n",
  					local->timer.function = &start_net;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists