From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751250AbdATDXq (ORCPT ); Thu, 19 Jan 2017 22:23:46 -0500 Received: from ozlabs.org ([103.22.144.67]:53865 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbdATDXp (ORCPT ); Thu, 19 Jan 2017 22:23:45 -0500 Date: Fri, 20 Jan 2017 14:23:43 +1100 From: Stephen Rothwell To: James Bottomley , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Martin K. Petersen" Subject: linux-next: manual merge of the scsi tree with the tip tree Message-ID: <20170120142343.3d2e72af@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 James, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/mpt3sas/mpt3sas_scsih.c between commit: e963b7088dac ("scsi: mpt3sas: Fix hang on ata passthru commands") from the tip tree and commit: ffb584565894 ("scsi: mpt3sas: fix hang on ata passthrough commands") from the scsi tree. I fixed it up (slightly different versions of the same patch - I used the latter version) 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