From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bart Van Assche <Bart.VanAssche@wdc.com>,
"josh@joshtriplett.org" <josh@joshtriplett.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"martin.petersen@oracle.com" <martin.petersen@oracle.com>,
"ptikhomirov@virtuozzo.com" <ptikhomirov@virtuozzo.com>
Subject: Re: linux-next: build failure after merge of the scsi-mkp tree
Date: Thu, 7 Dec 2017 13:10:17 -0800 [thread overview]
Message-ID: <20171207211017.GU7829@linux.vnet.ibm.com> (raw)
In-Reply-To: <20171208073439.1593936d@canb.auug.org.au>
On Fri, Dec 08, 2017 at 07:34:39AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > On Thu, Dec 07, 2017 at 05:30:03PM +0000, Bart Van Assche wrote:
> > > However, what's not clear to me is through which tree this patch should be
> > > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should
> > > Martin perhaps queue it in his tree for v4.16-rc1?
> >
> > I have to defer to you guys on that one. Left to myself, I will just
> > push it into the next merge window (as opposed to using my normal process,
> > which at this point would get it into the one following).
> >
> > So please let me know how you would like to proceed.
>
> Clearly, it needs to go via Martin's tree as otherwise his tree will
> not build in some circumstances ... or if it going to cause problems
> for Paul, then it should be in a separate non-rebasing branch (probably
> of Paul's tree) that is merged into Pauls main branch and Marin's tree.
It is unlikely to cause problems, so please let it go up where convenient.
Just please let me know.
Thanx, Paul
next prev parent reply other threads:[~2017-12-07 21:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171207145728.57cd9ac4@canb.auug.org.au>
[not found] ` <1512619169.3298.3.camel@wdc.com>
[not found] ` <20171207152521.0036b131@canb.auug.org.au>
[not found] ` <20171207044222.GK7829@linux.vnet.ibm.com>
2017-12-07 17:30 ` linux-next: build failure after merge of the scsi-mkp tree Bart Van Assche
2017-12-07 17:40 ` Paul E. McKenney
2017-12-07 20:34 ` Stephen Rothwell
2017-12-07 21:10 ` Paul E. McKenney [this message]
2017-12-07 21:11 ` Martin K. Petersen
2017-12-08 1:00 ` Martin K. Petersen
2017-12-11 17:43 ` Paul E. McKenney
[not found] <20210817194710.1cb707ba@canb.auug.org.au>
2021-08-17 9:51 ` John Garry
2021-08-18 3:07 ` Bart Van Assche
2021-08-18 11:41 ` John Garry
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=20171207211017.GU7829@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=Bart.VanAssche@wdc.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ptikhomirov@virtuozzo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).