Re: linux-next: manual merge of the scsi tree with the s390 tree

From: Martin Schwidefsky
Date: Tue Oct 25 2011 - 03:05:37 EST

On Tue, 25 Oct 2011 17:16:01 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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,

"Reality continues to ruin my life." - Calvin.

Attachment: signature.asc
Description: PGP signature