From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Martin K. Petersen" Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree Date: Tue, 11 Apr 2017 21:00:46 -0400 Message-ID: References: <20170407153351.0ecafd59@canb.auug.org.au> <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> (Bart Van Assche's message of "Fri, 7 Apr 2017 08:49:14 -0700") Sender: linux-kernel-owner@vger.kernel.org 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" List-Id: linux-next.vger.kernel.org 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