On 04/07/2017 10:50 PM, Bart Van Assche wrote: > On Fri, 2017-04-07 at 13:29 -0600, Logan Gunthorpe wrote: >> 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. > > Boaz, had you noticed Logan's osd patch? If not, can you have a look? > I did look, I even sent an ACK on one of the early versions. The merge breakage is more of a build issue because I never had get_device fail for me in my testing so it is more academic. Yes they both look fine BTW Boaz > Thanks, > Bart. > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html