linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Michael Wang <yun.wang@linux.alibaba.com>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree
Date: Thu, 28 Oct 2021 09:14:37 -0400	[thread overview]
Message-ID: <20211028091437.7a3d0838@gandalf.local.home> (raw)
In-Reply-To: <20211028163111.7f09f7eb@canb.auug.org.au>


On Thu, 28 Oct 2021 16:31:11 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the ftrace tree got conflicts in:
> 
>   include/linux/trace_recursion.h
>   kernel/trace/ftrace.c

Yeah, this is one of the times I will be sending Linus a link to the merge
of his tree in my repo for my pull request. I have this ready.

> @@@ -162,12 -192,22 +165,18 @@@
>   	current->trace_recursion = val;
>   	barrier();
>   
> + 	preempt_disable_notrace();
> + 

The only difference between what I have and yours, is that I nuked the
extra space ;-)

Thanks,

-- Steve


>  -	return bit + 1;
>  +	return bit;
>   }
>   

  reply	other threads:[~2021-10-28 13:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-28  5:31 linux-next: manual merge of the ftrace tree with Linus' tree Stephen Rothwell
2021-10-28 13:14 ` Steven Rostedt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-28  1:59 Stephen Rothwell
2023-04-11  2:46 Stephen Rothwell
2023-04-11  3:01 ` Steven Rostedt
2021-09-15  0:44 Stephen Rothwell
2021-09-15  0:47 ` Steven Rostedt
2021-02-15  4:03 Stephen Rothwell
2020-12-08  5:02 Stephen Rothwell
2020-12-14 20:37 ` Stephen Rothwell
2020-12-14 21:33   ` Steven Rostedt
2019-05-16  1:05 Stephen Rothwell
2019-05-16  1:53 ` Steven Rostedt
2019-05-16  3:32   ` Stephen Rothwell
2019-05-16  1:00 Stephen Rothwell
2018-08-15  4:04 Stephen Rothwell
2015-11-05  2:51 Stephen Rothwell
2015-11-05  3:20 ` Steven Rostedt
2013-07-10  3:51 Stephen Rothwell
2013-04-22  5:55 Stephen Rothwell
2013-04-09  6:30 Stephen Rothwell
2013-03-18  2:00 Stephen Rothwell
2013-03-18 13:26 ` Steven Rostedt

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=20211028091437.7a3d0838@gandalf.local.home \
    --to=rostedt@goodmis.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --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).