public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Martin K. Petersen" <martin.petersen@oracle•com>
To: Bart Van Assche <bart.vanassche@sandisk•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	"Martin K. Petersen" <martin.petersen@oracle•com>,
	Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
	Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Logan Gunthorpe <logang@deltatee•com>,
	"linux-scsi@vger•kernel.org" <linux-scsi@vger•kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
Date: Tue, 11 Apr 2017 21:00:46 -0400	[thread overview]
Message-ID: <yq1k26qv3r5.fsf@oracle.com> (raw)
In-Reply-To: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> (Bart Van Assche's message of "Fri, 7 Apr 2017 08:49:14 -0700")

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

  parent reply	other threads:[~2017-04-12  1:00 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
2017-04-20 13:31       ` Boaz Harrosh
2017-04-12  1:00   ` Martin K. Petersen [this message]
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=yq1k26qv3r5.fsf@oracle.com \
    --to=martin.petersen@oracle$(echo .)com \
    --cc=arnd@arndb$(echo .)de \
    --cc=bart.vanassche@sandisk$(echo .)com \
    --cc=greg@kroah$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-scsi@vger$(echo .)kernel.org \
    --cc=logang@deltatee$(echo .)com \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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