Messages in this thread | | | Date | Mon, 13 Apr 2015 14:58:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with Linus' tree |
| |
Hi Jens,
Today's linux-next merge of the block tree got a conflict in block/blk-mq.c between commit ac2111753ca9 ("blk-mq: initialize 'struct request' and associated data to zero") from Linus' tree and commit cef4e5c345d3 ("blk-mq: ensure that request and PDU data are zeroed at init time") from the block tree.
I fixed it up (just formatted differently - I used the block tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |