Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbdDGFeD (ORCPT ); Fri, 7 Apr 2017 01:34:03 -0400 Received: from ozlabs.org ([103.22.144.67]:58745 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083AbdDGFdx (ORCPT ); Fri, 7 Apr 2017 01:33:53 -0400 Date: Fri, 7 Apr 2017 15:33:51 +1000 From: Stephen Rothwell To: "Martin K. Petersen" , Greg KH , Arnd Bergmann Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Bart Van Assche , Logan Gunthorpe Subject: linux-next: manual merge of the scsi-mkp tree with the char-misc tree Message-ID: <20170407153351.0ecafd59@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 Content-Length: 845 Lines: 28 Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/osd/osd_uld.c between commit: ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function") from the char-misc tree and commit: c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value") from the scsi-mkp tree. I am not sure how to resolve this, so I have just effectively recerted the latter commit fo today. Better suggestions welcome. I fixed it up 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