Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754187AbdFWDJ2 (ORCPT ); Thu, 22 Jun 2017 23:09:28 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:35838 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754166AbdFWDJ0 (ORCPT ); Thu, 22 Jun 2017 23:09:26 -0400 Subject: Re: linux-next: manual merge of the block tree with Linus' tree To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig References: <20170623130632.03bc60af@canb.auug.org.au> From: Jens Axboe Message-ID: Date: Thu, 22 Jun 2017 21:09:22 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170623130632.03bc60af@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 927 Lines: 29 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