Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc
 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
References: <20170407153351.0ecafd59@canb.auug.org.au>
CC: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
        Bart Van Assche <Bart.VanAssche@sandisk.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
From: Bart Van Assche <bart.vanassche@sandisk.com>
Message-ID: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com>
Date: Fri, 7 Apr 2017 08:49:14 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <20170407153351.0ecafd59@canb.auug.org.au>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
WDCIPOUTBOUND: EOP-TRUE
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 15:49:18.0496
 (UTC)
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=b61c8803-16f3-4c35-9b17-6f65f441df86;Ip=[63.163.107.21];Helo=[milsmgep15.sandisk.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR04MB108
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1135
Lines: 37

On 04/06/2017 10:33 PM, Stephen Rothwell wrote:
> 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.

(+linux-scsi)

Hello Martin,

Sorry that I had not yet noticed Logan's patch series. Should my two
patches that conflict with Logan's patch series be dropped and reworked
after Logan's patches are upstream?

Thanks,

Bart.