From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>, Jonathan Corbet <corbet@lwn.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Changbin Du <changbin.du@intel.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
Date: Wed, 21 Mar 2018 15:37:15 +1100 [thread overview]
Message-ID: <20180321153715.3a571e5b@canb.auug.org.au> (raw)
In-Reply-To: <20180321153127.23737f6e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
Hi all,
On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> Documentation/trace/ftrace.txt
> (converted to Documentation/trace/ftrace.rst)
There was another conflict involving
Documentation/trace/events.{txt,rst}
Unfortunately, I accidentally deleted the report email before sending
it :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-03-21 4:37 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 [this message]
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
-- 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=20180321153715.3a571e5b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=changbin.du@intel.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tom.zanussi@linux.intel.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