From: Bart Van Assche <Bart.VanAssche@sandisk.com>
To: "martin.petersen@oracle.com" <martin.petersen@oracle.com>
Cc: "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"logang@deltatee.com" <logang@deltatee.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"greg@kroah.com" <greg@kroah.com>,
"arnd@arndb.de" <arnd@arndb.de>,
"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: Wed, 12 Apr 2017 17:44:34 +0000 [thread overview]
Message-ID: <1492019073.2764.7.camel@sandisk.com> (raw)
In-Reply-To: <yq1k26qv3r5.fsf@oracle.com>
On Tue, 2017-04-11 at 21:00 -0400, Martin K. Petersen wrote:
> Bart Van Assche <bart.vanassche@sandisk.com> 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?
Hello Martin,
Logan's patch series has been queued by Greg KH for kernel 4.12. So Linus
will have to resolve the merge conflict between Greg's char-misc tree and
the SCSI tree during the 4.12 merge window. See also
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/log/?h=char-misc-next&ofs=250
Bart.
prev parent reply other threads:[~2017-04-12 17:44 UTC|newest]
Thread overview: 8+ 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
2017-04-12 1:00 ` Martin K. Petersen
2017-04-12 1:00 ` Martin K. Petersen
2017-04-12 17:44 ` Bart Van Assche [this message]
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=1492019073.2764.7.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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.