From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753136AbcKICyU (ORCPT ); Tue, 8 Nov 2016 21:54:20 -0500 Received: from ozlabs.org ([103.22.144.67]:52255 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753036AbcKICyQ (ORCPT ); Tue, 8 Nov 2016 21:54:16 -0500 Date: Wed, 9 Nov 2016 13:54:14 +1100 From: Stephen Rothwell To: "Martin K. Petersen" , Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: linux-next: manual merge of the scsi-mkp tree with the block tree Message-ID: <20161109135414.283a9ac5@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 Martin, Today's linux-next merge of the scsi-mkp tree got conflicts in: drivers/scsi/ufs/ufshcd.c between commit: e806402130c9 ("block: split out request-only flags into a new namespace") from the block tree and commit: dcea0bfbc4cb ("scsi: ufs: fix sense buffer size to 18 bytes") from the scsi-mkp tree. This latter commit also exists as commit 2266d5678ad1 in the scsi tree, but unfortunately, the scsi-mkp tree was rebased overnight, so now the two patches are not the same commit :-( A significant path of what was rebased overnight has already been merged into the scsi tree ... so please tidy up your tree WRT the scsi tree. This conflict would not exist if the rebase had not been done. I fixed it up (it is also fixed in the scsi tree merge and so just taking that version of the resolution works) 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