From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dominik Brodowski <linux@dominikbrodowski•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Julia Lawall <julia@diku•dk>,
"John W. Linville" <linville@tuxdriver•com>
Subject: linux-next: manual merge of the pcmcia tree with the wireless tree
Date: Wed, 11 Nov 2009 15:33:02 +1100 [thread overview]
Message-ID: <20091111153302.0f5074ef.sfr@canb.auug.org.au> (raw)
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
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
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
del_timer(&local->timer);
local->timer.expires = jiffies + HZ * 5;
local->timer.data = (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->sparm.b4.a_current_ess_id);
local->timer.function = &start_net;
next reply other threads:[~2009-11-11 4:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-11 4:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-04 3:57 linux-next: manual merge of the pcmcia tree with the wireless tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091111153302.0f5074ef.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=julia@diku$(echo .)dk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox