From: Bart Van Assche <Bart.VanAssche@sandisk.com>
To: "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>,
"ooo@electrozaur.com" <ooo@electrozaur.com>,
"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: Fri, 7 Apr 2017 19:50:58 +0000 [thread overview]
Message-ID: <1491594657.2559.24.camel@sandisk.com> (raw)
In-Reply-To: <ba19c6cf-a762-f7f7-6e27-ef64e3e578c1@deltatee.com>
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?
Thanks,
Bart.
next prev parent reply other threads:[~2017-04-07 19:51 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 [this message]
2017-04-20 13:31 ` Boaz Harrosh
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=1491594657.2559.24.camel@sandisk.com \
--to=bart.vanassche@sandisk.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=martin.petersen@oracle.com \
--cc=ooo@electrozaur.com \
--cc=openosd@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).