From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org, Swen Schillig <swen@vnet•ibm.com>,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Christof Schmitt <christof.schmitt@de•ibm.com>
Subject: linux-next: manual merge of the s390 tree
Date: Tue, 2 Dec 2008 09:39:20 +1100 [thread overview]
Message-ID: <20081202093920.7f700183.sfr@canb.auug.org.au> (raw)
Hi Martin,
Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/scsi/zfcp_erp.c between commit
fca55b6fb587e42c7761ee30bd1a6c313a9270c9 ("[SCSI] zfcp: fix deadlock
between wq triggered port scan and ERP") from the scsi-rc-fixes tree and
commit c70beccd971850d07d0dc5afcd5e1c6580c7e1e5 ("[S390] zfcp: Report
microcode level through service level interface") from the s390 tree.
I fixed it up (by taking both changes - see below) and can carry the
fix. Someone should check that it is correct.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/s390/scsi/zfcp_erp.c
index c557ba3,e63eebf..0000000
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@@ -1281,10 -1283,11 +1284,13 @@@ static void zfcp_erp_action_cleanup(str
break;
case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
- if (result != ZFCP_ERP_SUCCEEDED)
+ if (result != ZFCP_ERP_SUCCEEDED) {
+ unregister_service_level(&adapter->service_level);
zfcp_erp_rports_del(adapter);
- else
- } else
++ } else {
+ register_service_level(&adapter->service_level);
+ schedule_work(&adapter->scan_work);
++ }
zfcp_adapter_put(adapter);
break;
}
next reply other threads:[~2008-12-01 22:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 22:39 Stephen Rothwell [this message]
2008-12-02 8:12 ` linux-next: manual merge of the s390 tree Martin Schwidefsky
2008-12-02 22:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-19 23:13 Stephen Rothwell
2008-11-20 11:10 ` Martin Schwidefsky
2008-11-20 11:57 ` Stephen Rothwell
2008-10-29 0:06 Stephen Rothwell
2008-07-01 4:43 Stephen Rothwell
2008-06-24 3:45 Stephen Rothwell
2008-06-24 4:27 ` Greg KH
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=20081202093920.7f700183.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=christof.schmitt@de$(echo .)ibm.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=swen@vnet$(echo .)ibm.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