linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
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: Fri, 8 Dec 2017 07:34:39 +1100	[thread overview]
Message-ID: <20171208073439.1593936d@canb.auug.org.au> (raw)
In-Reply-To: <20171207174038.GQ7829@linux.vnet.ibm.com>

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.
-- 
Cheers,
Stephen Rothwell

  reply	other threads:[~2017-12-07 20:34 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-07  3:57 linux-next: build failure after merge of the scsi-mkp tree Stephen Rothwell
2017-12-07  3:59 ` Bart Van Assche
2017-12-07  4:25   ` Stephen Rothwell
2017-12-07  4:42     ` Paul E. McKenney
2017-12-07 17:30       ` Bart Van Assche
2017-12-07 17:40         ` Paul E. McKenney
2017-12-07 20:34           ` Stephen Rothwell [this message]
2017-12-07 21:10             ` Paul E. McKenney
2017-12-07 21:11             ` Martin K. Petersen
2017-12-08  1:00               ` Martin K. Petersen
2017-12-11 17:43                 ` Paul E. McKenney
  -- strict thread matches above, loose matches on Subject: below --
2023-08-22  5:32 Stephen Rothwell
2023-08-23 22:55 ` Stephen Rothwell
2023-08-23 22:59   ` Martin K. Petersen
2023-06-15  3:43 Stephen Rothwell
2023-06-15  4:19 ` Damien Le Moal
2023-06-16 16:51   ` Martin K. Petersen
2023-01-16  2:24 Stephen Rothwell
2023-01-16 17:55 ` Mike Christie
2023-01-16 18:07   ` Martin K. Petersen
2022-08-24  1:50 Stephen Rothwell
2022-08-29  4:54 ` Stephen Rothwell
2022-08-30  2:11 ` Martin K. Petersen
2022-04-27  3:38 Stephen Rothwell
2022-04-27  7:40 ` Sumit Saxena
2022-04-27  8:28   ` Stephen Rothwell
2021-08-17  9:47 Stephen Rothwell
2021-08-17  9:51 ` John Garry
2021-08-18  3:07   ` Bart Van Assche
2021-08-18 11:41     ` John Garry
2021-05-27  3:47 Stephen Rothwell
2021-03-12  3:17 Stephen Rothwell
2021-03-12  3:20 ` Jens Axboe
2021-01-25  4:13 Stephen Rothwell
2021-01-25  5:53 ` Douglas Gilbert
2021-01-27  7:01   ` Stephen Rothwell
2021-01-27 17:10     ` Douglas Gilbert
2020-12-08  9:28 Stephen Rothwell
2020-12-08  9:30 ` Christoph Hellwig
2020-12-08 10:01   ` Stephen Rothwell
2020-12-08  9:38 ` Stephen Rothwell
2020-12-08 17:55   ` Alan Stern
2020-12-08 19:56     ` Bart Van Assche
2020-07-21  6:30 Stephen Rothwell
2020-07-23  5:54 ` Stephen Rothwell
2020-07-23 15:01   ` Martin K. Petersen
2020-07-24  4:21     ` Kiwoong Kim
2020-01-22  4:10 Stephen Rothwell
2020-01-22  9:51 ` John Garry
2020-01-23  2:22   ` Martin K. Petersen
2019-10-25  3:07 Stephen Rothwell
2019-10-25 18:03 ` James Smart
2019-10-28  5:49 ` Stephen Rothwell
2019-10-29  2:28   ` Martin K. Petersen
2019-10-29  2:48     ` Stephen Rothwell
2019-04-09  6:27 Stephen Rothwell
2019-04-10  1:21 ` Stephen Rothwell
2019-04-10  1:33   ` Martin K. Petersen
2019-04-10  4:04     ` James Bottomley
2019-04-10  4:57       ` Stephen Rothwell
2018-03-22  6:25 Stephen Rothwell
2018-03-22 16:33 ` Madhani, Himanshu
2017-05-17  2:57 Stephen Rothwell
2017-02-23  3:12 Stephen Rothwell
2017-02-23 14:19 ` Martin K. Petersen
2017-02-23 15:04   ` Chad Dupuis
2017-02-22  2:41 Stephen Rothwell
2017-02-22 21:06 ` Stephen Rothwell
2017-02-22 21:10   ` Martin K. Petersen
2017-02-22 21:13     ` James Bottomley
2017-02-22 21:17       ` Martin K. Petersen
2017-02-27  1:54   ` Stephen Rothwell
2017-02-27 15:25     ` James Bottomley

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=20171208073439.1593936d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --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=paulmck@linux.vnet.ibm.com \
    --cc=ptikhomirov@virtuozzo.com \
    /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).