From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>,
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: Re: linux-next: manual merge of the s390 tree
Date: Tue, 02 Dec 2008 09:12:11 +0100 [thread overview]
Message-ID: <1228205531.3250.3.camel@localhost> (raw)
In-Reply-To: <20081202093920.7f700183.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2008-12-02 8:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 22:39 linux-next: manual merge of the s390 tree Stephen Rothwell
2008-12-02 8:12 ` Martin Schwidefsky [this message]
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=1228205531.3250.3.camel@localhost \
--to=schwidefsky@de.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=christof.schmitt@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=swen@vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.