lkml.org 
[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the scsi tree with the s390 tree
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.

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-10-25 09:07    [W:0.042 / U:0.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site