Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree

From	Bart Van Assche <Bart.VanAssche@sandisk.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
Date	2017-04-12 19:50 +0200
Message-ID	<tvuz2-7rV-75@gated-at.bofh.it> (permalink)
References	<ttuMO-2Vb-7@gated-at.bofh.it> <ttHK1-3kh-15@gated-at.bofh.it> <tveXf-6fz-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-04-12 03:10 +0200
  Re: linux-next: manual merge of the scsi-mkp tree with the char-misc  tree Bart Van Assche <Bart.VanAssche@sandisk.com> - 2017-04-12 19:50 +0200

csiph-web