From: Boaz Harrosh <ooo@electrozaur•com>
To: Bart Van Assche <Bart.VanAssche@sandisk•com>,
"sfr@canb•auug.org.au" <sfr@canb•auug.org.au>,
"logang@deltatee•com" <logang@deltatee•com>,
"greg@kroah•com" <greg@kroah•com>,
"martin.petersen@oracle•com" <martin.petersen@oracle•com>,
"arnd@arndb•de" <arnd@arndb•de>
Cc: "linux-scsi@vger•kernel.org" <linux-scsi@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"openosd@gmail•com" <openosd@gmail•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
Date: Thu, 20 Apr 2017 16:31:17 +0300 [thread overview]
Message-ID: <1102ca05-a6ea-156e-eddf-1073aa082e66@electrozaur.com> (raw)
In-Reply-To: <1491594657.2559.24.camel@sandisk.com>
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.
>
next prev parent reply other threads:[~2017-04-20 13:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 5:33 linux-next: manual merge of the scsi-mkp tree with the char-misc tree Stephen Rothwell
2017-04-07 15:49 ` Bart Van Assche
2017-04-07 19:29 ` Logan Gunthorpe
2017-04-07 19:50 ` Bart Van Assche
2017-04-20 13:31 ` Boaz Harrosh [this message]
2017-04-12 1:00 ` Martin K. Petersen
2017-04-12 17:44 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1102ca05-a6ea-156e-eddf-1073aa082e66@electrozaur.com \
--to=ooo@electrozaur$(echo .)com \
--cc=Bart.VanAssche@sandisk$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-scsi@vger$(echo .)kernel.org \
--cc=logang@deltatee$(echo .)com \
--cc=martin.petersen@oracle$(echo .)com \
--cc=openosd@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox