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

2017-06-13 Thread Sebastian Ott
Hi, On Tue, 13 Jun 2017, Christoph Hellwig wrote: > Btw, scm_blk.c blk-mq conversion seems odd if not broken. It should > always call blk_mq_complete_request from scm_request_finish and > then pass the error to blk_mq_end_request frin > there. OK. I had added that because rq->errors went away. W

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

2017-06-12 Thread Stephen Rothwell
Hi Christoph, On Tue, 13 Jun 2017 08:20:55 +0200 Christoph Hellwig wrote: > > Btw, scm_blk.c blk-mq conversion seems odd if not broken. It should > always call blk_mq_complete_request from scm_request_finish and > then pass the error to blk_mq_end_request frin > there. > > It would be great if

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

2017-06-12 Thread Christoph Hellwig
Btw, scm_blk.c blk-mq conversion seems odd if not broken. It should always call blk_mq_complete_request from scm_request_finish and then pass the error to blk_mq_end_request frin there. It would be great if such major block driver changes were Cc'ed to linux-block.

linux-next: manual merge of the block tree with the s390 tree

2017-06-12 Thread Stephen Rothwell
Hi Jens, Today's linux-next merge of the block tree got conflicts in: drivers/s390/block/scm_blk.c drivers/s390/block/scm_blk.h between commits: 94d26bfcf312 ("s390/scm: remove cluster option") c7b3e92331fb ("s390/scm: convert tasklet") from the s390 tree and commit: 2a842acab109 ("