From: Linus Torvalds <torvalds@linux-foundation.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Arnd Bergmann" <arnd@arndb.de>,
"Carles Pey" <carles.pey@gmail.com>,
"Changbin Du" <changbin.du@intel.com>,
"Daniel Bristot de Oliveira" <bristot@kernel.org>,
"Jiri Olsa" <jolsa@redhat.com>,
"Josh Poimboeuf" <jpoimboe@redhat.com>,
"Kalesh Singh" <kaleshsingh@google.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Punit Agrawal" <punitagrawal@gmail.com>,
"Robin H. Johnson" <robbat2@gentoo.org>,
"Song Liu" <songliubraving@fb.com>,
"Sven Schnelle" <svens@linux.ibm.com>,
"Tiezhu Yang" <yangtiezhu@loongson.cn>,
"Viktor Rosendahl" <Viktor.Rosendahl@bmw.de>,
"Wang ShaoBo" <bobo.shaobowang@huawei.com>,
"Weizhao Ouyang" <o451686892@gmail.com>,
chongjiapeng <jiapeng.chong@linux.alibaba.com>,
"kernel test robot" <lkp@intel.com>,
王贇 <yun.wang@linux.alibaba.com>,
"Heiko Carstens" <hca@linux.ibm.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Subject: Re: [GIT PULL] tracing: Updates for 5.16
Date: Mon, 1 Nov 2021 20:08:30 -0700 [thread overview]
Message-ID: <CAHk-=wgY1B0Ae+gVNP0e2bZPSBgaDJPwSVXFOx5r-dGgurJuvQ@mail.gmail.com> (raw)
In-Reply-To: <20211101175544.00fc0d57@gandalf.local.home>
On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt <rostedt@goodmis.org> wrote:
>
> Also, this pull request will conflict with your tree against a fix I had
> for trace recursions. I did the conflict resolution and pushed it to my
> ftrace/conflicts branch if you want to reference it.
In the meantime, my tree had grown a few more conflicts elsewhere, but
it all looked fairly straightforward.
It might be a good idea if you were to double-check that everything
looks good, though.
Linus
next prev parent reply other threads:[~2021-11-02 3:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 21:55 [GIT PULL] tracing: Updates for 5.16 Steven Rostedt
2021-11-02 3:08 ` Linus Torvalds [this message]
2021-11-02 13:17 ` Steven Rostedt
2021-11-02 17:41 ` Masami Hiramatsu
2021-11-02 3:17 ` pr-tracker-bot
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='CAHk-=wgY1B0Ae+gVNP0e2bZPSBgaDJPwSVXFOx5r-dGgurJuvQ@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=Viktor.Rosendahl@bmw.de \
--cc=arnd@arndb.de \
--cc=bobo.shaobowang@huawei.com \
--cc=bristot@kernel.org \
--cc=carles.pey@gmail.com \
--cc=changbin.du@intel.com \
--cc=gustavoars@kernel.org \
--cc=hca@linux.ibm.com \
--cc=jiapeng.chong@linux.alibaba.com \
--cc=jolsa@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=kaleshsingh@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=o451686892@gmail.com \
--cc=punitagrawal@gmail.com \
--cc=robbat2@gentoo.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=svens@linux.ibm.com \
--cc=yangtiezhu@loongson.cn \
--cc=yun.wang@linux.alibaba.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).