From: Steven Rostedt <rostedt@goodmis•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Tom Zanussi <tom.zanussi@linux•intel.com>,
Jonathan Corbet <corbet@lwn•net>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Changbin Du <changbin.du@intel•com>
Subject: Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
Date: Thu, 22 Mar 2018 09:41:17 -0400 [thread overview]
Message-ID: <20180322094117.37f3a2fd@gandalf.local.home> (raw)
In-Reply-To: <20180322092108.0d821abc@canb.auug.org.au>
On Thu, 22 Mar 2018 09:21:08 +1100
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > I can repost the whole thing as v10, or whatever makes sense here.
>
> Thanks, I assume that they apply on top of the jc_docs tree as well
> (git://git.lwn.net/linux.git#docs-next). If so, then I can use them as
> merge resolutions, or Steve can rebase his tree (minus your old
> patches) on top of the (hopefully unchanging) jc_docs tree and then he
> could apply your patches there.
Too late for a rebase. I've already run it through my tests and posted,
I don't rebase anything that goes to linux-next unless there's a really
good reason to do so. I don't think this is one.
I'll just make sure Linus knows about it and have a link to point to
the proper end results. He's stated he's fine with those kinds of
solutions. And since this is only a documentation conflict, we don't
need to worry about mistakes causing subtle behavior with the kernel.
-- Steve
next prev parent reply other threads:[~2018-03-22 13:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 4:31 linux-next: manual merge of the ftrace tree with the jc_docs tree Stephen Rothwell
2018-03-21 4:37 ` Stephen Rothwell
2018-03-21 13:15 ` Steven Rostedt
2018-03-21 20:55 ` Tom Zanussi
2018-03-21 22:21 ` Stephen Rothwell
2018-03-21 23:09 ` Tom Zanussi
2018-03-22 13:41 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-20 4:02 Stephen Rothwell
2023-02-13 1:24 Stephen Rothwell
2023-02-15 1:16 Stephen Rothwell
2023-02-15 2:03 ` Bagas Sanjaya
2025-11-21 1:35 Stephen Rothwell
2025-11-21 3:07 ` Bagas Sanjaya
2025-11-26 10:07 ` Gopi Krishna Menon
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=20180322094117.37f3a2fd@gandalf.local.home \
--to=rostedt@goodmis$(echo .)org \
--cc=changbin.du@intel$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tom.zanussi@linux$(echo .)intel.com \
/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