linux-kernel - linux-next: manual merge of the trivial tree with the block 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>] [day] [month] [year] [list]

Date:	Wed, 10 Sep 2014 16:02:25 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>, Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>,
	Joe Lawrence <joe.lawrence@...atus.com>
Subject: linux-next: manual merge of the trivial tree with the block tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
block/blk-core.c between commit a492f075450f ("block,scsi: fixup
blk_get_request dead queue scenarios") from the block tree and commit
da3dae54e4ff ("Documentation: Docbook: Fix generated
DocBook/kernel-api.xml") from the trivial tree.

I fixed it up (the former also fixed a few places that were fixed in
the latter) 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)