From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751893AbdFZC2h (ORCPT ); Sun, 25 Jun 2017 22:28:37 -0400 Received: from ozlabs.org ([103.22.144.67]:52447 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbdFZC23 (ORCPT ); Sun, 25 Jun 2017 22:28:29 -0400 Date: Mon, 26 Jun 2017 12:28:26 +1000 From: Stephen Rothwell To: Jens Axboe Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mike Snitzer , Christoph Hellwig Subject: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20170626122826.5f84fe96@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in: drivers/md/dm-io.c between commit: feb7695fe9fb ("dm io: fix duplicate bio completion due to missing ref count") from Linus' tree and commit: 4e4cbee93d56 ("block: switch bios to blk_status_t") 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. -- Cheers, Stephen Rothwell diff --cc drivers/md/dm-io.c index 8d5ca30f6551,81248a8a8b57..000000000000 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c @@@ -317,9 -318,9 +318,9 @@@ static void do_region(int op, int op_fl else if (op == REQ_OP_WRITE_SAME) special_cmd_max_sectors = q->limits.max_write_same_sectors; if ((op == REQ_OP_DISCARD || op == REQ_OP_WRITE_ZEROES || - op == REQ_OP_WRITE_SAME) && - special_cmd_max_sectors == 0) { + op == REQ_OP_WRITE_SAME) && special_cmd_max_sectors == 0) { + atomic_inc(&io->count); - dec_count(io, region, -EOPNOTSUPP); + dec_count(io, region, BLK_STS_NOTSUPP); return; }