Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1619055

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

From Logan Gunthorpe <logang@deltatee.com>
Newsgroups linux.kernel
Subject Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
Date 2017-04-07 21:30 +0200
Message-ID <ttHK1-3kh-13@gated-at.bofh.it> (permalink)
References <ttuMO-2Vb-7@gated-at.bofh.it> <ttHK1-3kh-15@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Hi Bart,

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.

Thanks,

Logan

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


Thread

linux-next: manual merge of the scsi-mkp tree with the char-misc  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 07:40 +0200
  Re: linux-next: manual merge of the scsi-mkp tree with the char-misc  tree Logan Gunthorpe <logang@deltatee.com> - 2017-04-07 21:30 +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-07 22:00 +0200

csiph-web