* linux-next: manual merge of the trivial tree with the block tree
@ 2014-09-10 6:02 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-10 6:02 UTC (permalink / raw)
To: Jiri Kosina, Jens Axboe
Cc: linux-next, linux-kernel, Masanari Iida, Joe Lawrence
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
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@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-10 6:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-10 6:02 linux-next: manual merge of the trivial tree with the block tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox