On Tue, 2008-12-02 at 09:39 +1100, Stephen Rothwell wrote:
> 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.
Your fixup is fine.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
