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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20111025090521.51cbd1ce@de.ibm.com>
Date:	Tue, 25 Oct 2011 09:05:21 +0200
From:	Martin Schwidefsky <schwidefsky@...ibm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	James Bottomley <James.Bottomley@...senPartnership.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Swen Schillig <swen@...t.ibm.com>,
	Steffen Maier <maier@...ux.vnet.ibm.com>,
	Jan Glauber <jang@...ux.vnet.ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: Re: linux-next: manual merge of the scsi tree with the s390 tree

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


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)