Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1621735 > unrolled thread
| Started by | "Martin K. Petersen" <martin.petersen@oracle.com> |
|---|---|
| First post | 2017-04-12 03:10 +0200 |
| Last post | 2017-04-12 19:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
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
| From | "Martin K. Petersen" <martin.petersen@oracle.com> |
|---|---|
| Date | 2017-04-12 03:10 +0200 |
| Subject | Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree |
| Message-ID | <tveXf-6fz-1@gated-at.bofh.it> |
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? -- Martin K. Petersen Oracle Linux Engineering
[toc] | [next] | [standalone]
| From | Bart Van Assche <Bart.VanAssche@sandisk.com> |
|---|---|
| Date | 2017-04-12 19:50 +0200 |
| Subject | Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree |
| Message-ID | <tvuz2-7rV-75@gated-at.bofh.it> |
| In reply to | #1621735 |
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web