Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934464AbdDGT3a (ORCPT ); Fri, 7 Apr 2017 15:29:30 -0400 Received: from ale.deltatee.com ([207.54.116.67]:44642 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933390AbdDGT3Y (ORCPT ); Fri, 7 Apr 2017 15:29:24 -0400 To: Bart Van Assche , Stephen Rothwell , "Martin K. Petersen" , Greg KH , Arnd Bergmann References: <20170407153351.0ecafd59@canb.auug.org.au> <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> Cc: Linux-Next Mailing List , Linux Kernel Mailing List , "linux-scsi@vger.kernel.org" From: Logan Gunthorpe Message-ID: Date: Fri, 7 Apr 2017 13:29:20 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 172.16.1.111 X-SA-Exim-Rcpt-To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, arnd@arndb.de, greg@kroah.com, martin.petersen@oracle.com, sfr@canb.auug.org.au, bart.vanassche@sandisk.com X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 689 Lines: 18 Hi Bart, On 07/04/17 09:49 AM, Bart Van Assche wrote: > 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? Yeah, Greg took my patchset around a few maintainers relatively quickly. This is the second conflict, so sorry about that. Looks like the easiest thing would be to just base your change off of mine. It doesn't look too difficult. If you can do it before my patch hits upstream, I'd appreciate some testing and/or review as no one from the scsi side responded and that particular patch was a bit more involved than I would have liked. Thanks, Logan