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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Wed, 2 Jul 2014 15:15:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Bottomley <James.Bottomley@...senPartnership.com>,
	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Douglas Gilbert <dgilbert@...erlog.com>,
	Douglas Gilbert <dgilbert@...erlog.com>,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the scsi tree with the  tree

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
include/scsi/sg.h between commit d15156138dad ("block SG_IO: add
SG_FLAG_Q_AT_HEAD flag") from the block tree and commit b15b9fab9f32
("sg: add SG_FLAG_Q_AT_TAIL flag") from the scsi tree.

I fixed it up (I used the version from the block tree) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

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

Powered by blists - more mailing lists