Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1673182

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

Show all headers | View raw

On 06/22/2017 09:06 PM, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   block/blk-mq-sched.c
> 
> between commit:
> 
>   8e8320c9315c ("blk-mq: fix performance regression with shared tags")
> 
> from Linus' tree and commits:
> 
>   d2c0d3832469 ("blk-mq: move blk_mq_sched_{get,put}_request to blk-mq.c")
>   44e8c2bff80b ("blk-mq: refactor blk_mq_sched_assign_ioc")
> 
> from the block tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'll cherry pick that commit into the 4.13 branch to get this resolved.

-- 
Jens Axboe

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:10 +0200
  Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:30 +0200
    Re: linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-23 05:40 +0200
      Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 06:00 +0200
  Re: linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-23 05:30 +0200
    Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:30 +0200

csiph-web