Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752236AbdDLBBP (ORCPT ); Tue, 11 Apr 2017 21:01:15 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:37623 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbdDLBBN (ORCPT ); Tue, 11 Apr 2017 21:01:13 -0400 To: Bart Van Assche Cc: Stephen Rothwell , "Martin K. Petersen" , Greg KH , Arnd Bergmann , Linux-Next Mailing List , "Linux Kernel Mailing List" , Logan Gunthorpe , "linux-scsi\@vger.kernel.org" Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree From: "Martin K. Petersen" Organization: Oracle Corporation References: <20170407153351.0ecafd59@canb.auug.org.au> <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> Date: Tue, 11 Apr 2017 21:00:46 -0400 In-Reply-To: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> (Bart Van Assche's message of "Fri, 7 Apr 2017 08:49:14 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 382 Lines: 11 Bart Van Assche writes: > 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? Obviously things break the minute you go on vacation. I'm back now. What's the current status? -- Martin K. Petersen Oracle Linux Engineering