LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the ftrace tree with the jc_docs tree
@ 2021-08-20  4:02 Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2021-08-20  4:02 UTC (permalink / raw)
  To: Steven Rostedt, Jonathan Corbet
  Cc: Hu Haowen, Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1851 bytes --]

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  MAINTAINERS

between commit:

  0c3b533cfdd5 ("MAINTAINERS: add entry for traditional Chinese documentation")

from the jc_docs tree and commit:

  db396be6ddc4 ("MAINTAINERS: Add an entry for os noise/latency")

from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 34cbc59bbea0,4268644cf86a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18921,14 -18798,20 +18921,28 @@@ F:	arch/x86/mm/testmmiotrace.
  F:	include/linux/mmiotrace.h
  F:	kernel/trace/trace_mmiotrace.c
  
+ TRACING OS NOISE / LATENCY TRACERS
+ M:	Steven Rostedt <rostedt@goodmis.org>
+ M:	Daniel Bristot de Oliveira <bristot@kernel.org>
+ S:	Maintained
+ F:	kernel/trace/trace_osnoise.c
+ F:	include/trace/events/osnoise.h
+ F:	kernel/trace/trace_hwlat.c
+ F:	kernel/trace/trace_irqsoff.c
+ F:	kernel/trace/trace_sched_wakeup.c
+ F:	Documentation/trace/osnoise-tracer.rst
+ F:	Documentation/trace/timerlat-tracer.rst
+ F:	Documentation/trace/hwlat_detector.rst
+ F:	arch/*/kernel/trace.c
+ 
 +TRADITIONAL CHINESE DOCUMENTATION
 +M:	Hu Haowen <src.res@email.cn>
 +L:	linux-doc-tw-discuss@lists.sourceforge.net
 +S:	Maintained
 +W:	https://github.com/srcres258/linux-doc
 +T:	git git://github.com/srcres258/linux-doc.git doc-zh-tw
 +F:	Documentation/translations/zh_TW/
 +
  TRIVIAL PATCHES
  M:	Jiri Kosina <trivial@kernel.org>
  S:	Maintained

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  2018-03-21 22:21       ` Stephen Rothwell
  2018-03-21 23:09         ` Tom Zanussi
@ 2018-03-22 13:41         ` Steven Rostedt
  1 sibling, 0 replies; 8+ messages in thread
From: Steven Rostedt @ 2018-03-22 13:41 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Tom Zanussi, Jonathan Corbet, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  2018-03-21 22:21       ` Stephen Rothwell
@ 2018-03-21 23:09         ` Tom Zanussi
  2018-03-22 13:41         ` Steven Rostedt
  1 sibling, 0 replies; 8+ messages in thread
From: Tom Zanussi @ 2018-03-21 23:09 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Steven Rostedt, Jonathan Corbet, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du

Hi Stephen,

On Thu, 2018-03-22 at 09:21 +1100, Stephen Rothwell wrote:
> Hi Tom,
> 
> On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi <tom.zanussi@linux.intel.com> wrote:
> >
> > Yeah, linux-next has changes to Documentation/trace/* that converts
> > those files to .rst, which linux-trace/frace/core doesn't have.
> > 
> > I've rebased the inter-event patches to linux-next/next-20180320 to
> > reflect those changes, which affect 9 of the files in the patchset.  The
> > updated patchset is here:
> > 
> > https://github.com/tzanussi/linux-trace-inter-event.git tzanussi/next-20180320-inter-event-v10                                               
> > https://github.com/tzanussi/linux-trace-inter-event/tree/tzanussi/next-20180320-inter-event-v10
> > 
> > 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.
> 

Yes, just checked and they do apply on top of the jc_docs branch
mentioned.

Thanks,

Tom 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  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
  0 siblings, 2 replies; 8+ messages in thread
From: Stephen Rothwell @ 2018-03-21 22:21 UTC (permalink / raw)
  To: Tom Zanussi
  Cc: Steven Rostedt, Jonathan Corbet, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

Hi Tom,

On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi <tom.zanussi@linux.intel.com> wrote:
>
> Yeah, linux-next has changes to Documentation/trace/* that converts
> those files to .rst, which linux-trace/frace/core doesn't have.
> 
> I've rebased the inter-event patches to linux-next/next-20180320 to
> reflect those changes, which affect 9 of the files in the patchset.  The
> updated patchset is here:
> 
> https://github.com/tzanussi/linux-trace-inter-event.git tzanussi/next-20180320-inter-event-v10                                               
> https://github.com/tzanussi/linux-trace-inter-event/tree/tzanussi/next-20180320-inter-event-v10
> 
> 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  2018-03-21 13:15   ` Steven Rostedt
@ 2018-03-21 20:55     ` Tom Zanussi
  2018-03-21 22:21       ` Stephen Rothwell
  0 siblings, 1 reply; 8+ messages in thread
From: Tom Zanussi @ 2018-03-21 20:55 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Stephen Rothwell, Jonathan Corbet, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du

On Wed, 2018-03-21 at 09:15 -0400, Steven Rostedt wrote:
> On Wed, 21 Mar 2018 15:37:15 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > 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 :-(
> > 
> 
> Ug yeah. All the histogram code was ripped out of the events.txt and
> a new file was created called histogram.txt. I'm guessing that should
> also be converted into an .rst file.
> 

Yeah, linux-next has changes to Documentation/trace/* that converts
those files to .rst, which linux-trace/frace/core doesn't have.

I've rebased the inter-event patches to linux-next/next-20180320 to
reflect those changes, which affect 9 of the files in the patchset.  The
updated patchset is here:

https://github.com/tzanussi/linux-trace-inter-event.git tzanussi/next-20180320-inter-event-v10                                               
https://github.com/tzanussi/linux-trace-inter-event/tree/tzanussi/next-20180320-inter-event-v10

I can repost the whole thing as v10, or whatever makes sense here.

Thanks,

Tom

> -- Steve

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  2018-03-21  4:37 ` Stephen Rothwell
@ 2018-03-21 13:15   ` Steven Rostedt
  2018-03-21 20:55     ` Tom Zanussi
  0 siblings, 1 reply; 8+ messages in thread
From: Steven Rostedt @ 2018-03-21 13:15 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jonathan Corbet, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du, Tom Zanussi

On Wed, 21 Mar 2018 15:37:15 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 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 :-(
> 

Ug yeah. All the histogram code was ripped out of the events.txt and
a new file was created called histogram.txt. I'm guessing that should
also be converted into an .rst file.

-- Steve

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the ftrace tree with the jc_docs tree
  2018-03-21  4:31 Stephen Rothwell
@ 2018-03-21  4:37 ` Stephen Rothwell
  2018-03-21 13:15   ` Steven Rostedt
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2018-03-21  4:37 UTC (permalink / raw)
  To: Steven Rostedt, Jonathan Corbet
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Changbin Du,
	Tom Zanussi

[-- 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 --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: manual merge of the ftrace tree with the jc_docs tree
@ 2018-03-21  4:31 Stephen Rothwell
  2018-03-21  4:37 ` Stephen Rothwell
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2018-03-21  4:31 UTC (permalink / raw)
  To: Steven Rostedt, Jonathan Corbet
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Changbin Du,
	Tom Zanussi

[-- Attachment #1: Type: text/plain, Size: 2403 bytes --]

Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in:

  Documentation/trace/ftrace.txt
  (converted to Documentation/trace/ftrace.rst)

between commit:

  1f198e22bc3a ("trace doc: convert trace/ftrace.txt to rst format")

from the jc_docs tree and commit:

  2c1ea60b195d ("tracing: Add timestamp_mode trace file")

from the ftrace tree.

I fixed it up (I deleted the file and added the merge fix patch below -
which probably needs more work) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non
trivial conflicts should be mentioned to your upstream maintainer when
your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Mar 2018 15:29:08 +1100
Subject: [PATCH] trace doc: merge fix for rst conversion of ftrace.txt

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/trace/ftrace.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 55637926abdc..8aad686ff9a5 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -543,6 +543,30 @@ of ftrace. Here is a list of some of the key files:
 
 	See events.txt for more information.
 
+  timestamp_mode:
+
+	Certain tracers may change the timestamp mode used when
+	logging trace events into the event buffer.  Events with
+	different modes can coexist within a buffer but the mode in
+	effect when an event is logged determines which timestamp mode
+	is used for that event.  The default timestamp mode is
+	'delta'.
+
+	Usual timestamp modes for tracing:
+
+	  # cat timestamp_mode
+	  [delta] absolute
+
+	  The timestamp mode with the square brackets around it is the
+	  one in effect.
+
+	  delta: Default timestamp mode - timestamp is a delta against
+	         a per-buffer timestamp.
+
+	  absolute: The timestamp is a full timestamp, not a delta
+                 against some other value.  As such it takes up more
+                 space and is less efficient.
+
   hwlat_detector:
 
 	Directory for the Hardware Latency Detector.
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-08-20  4:02 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-20  4:02 linux-next: manual merge of the ftrace tree with the jc_docs tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2018-03-21  4:31 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 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).