From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Swen Schillig <swen@vnet.ibm.com>,
Steffen Maier <maier@linux.vnet.ibm.com>,
Jan Glauber <jang@linux.vnet.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: linux-next: manual merge of the scsi tree with the s390 tree
Date: Tue, 25 Oct 2011 09:05:21 +0200 [thread overview]
Message-ID: <20111025090521.51cbd1ce@de.ibm.com> (raw)
In-Reply-To: <20111025171601.c2365840409d17df161ca8b5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
On Tue, 25 Oct 2011 17:16:01 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the scsi tree got a conflict in
> drivers/s390/cio/qdio_main.c between commit 9c20b3dd8479 ("[S390] qdio:
> EQBS retry after CCQ 96") from the s390 tree and commit dfe5bb506172
> ("[SCSI] qdio: base support for hardware data router with zfcp") from the
> scsi tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good. Thanks Stephen.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2011-10-25 7:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 6:16 linux-next: manual merge of the scsi tree with the s390 tree Stephen Rothwell
2011-10-25 7:05 ` Martin Schwidefsky [this message]
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=20111025090521.51cbd1ce@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jang@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maier@linux.vnet.ibm.com \
--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.