linux-next: manual merge of the ftrace tree

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

Hi all,

[I have reported this previously but something has changed slightly.]

Today's linux-next merge of the ftrace tree got a conflict in
kernel/module.c between commit bf8b9a59e335ca159aa4b3878ced0e94ea74cbc4
("driver core: basic infrastructure for per-module dynamic debug
messages") from the driver-core tree and commit
e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
from the ftrace tree.

Just overlapping additions.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/module.c
index b610466,6962348..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -44,9 -44,9 +44,10 @@@
  #include <linux/unwind.h>
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
 +#include <asm/sections.h>
  #include <linux/license.h>
  #include <asm/sections.h>
+ #include <linux/tracepoint.h>
  
  #if 0
  #define DEBUGP printk
@@@ -1866,7 -1832,8 +1867,9 @@@ static struct module *load_module(void 
  #endif
  	unsigned int markersindex;
  	unsigned int markersstringsindex;
 +	unsigned int verboseindex;
+ 	unsigned int tracepointsindex;
+ 	unsigned int tracepointsstringsindex;
  	struct module *mod;
  	long err = 0;
  	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
@@@ -2153,7 -2120,9 +2156,10 @@@
  	markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
   	markersstringsindex = find_sec(hdr, sechdrs, secstrings,
  					"__markers_strings");
 +	verboseindex = find_sec(hdr, sechdrs, secstrings, "__verbose");
+ 	tracepointsindex = find_sec(hdr, sechdrs, secstrings, "__tracepoints");
+ 	tracepointsstringsindex = find_sec(hdr, sechdrs, secstrings,
+ 					"__tracepoints_strings");
  
  	/* Now do relocations. */
  	for (i = 1; i < hdr->e_shnum; i++) {
@@@ -2203,8 -2179,11 +2216,12 @@@
  		marker_update_probe_range(mod->markers,
  			mod->markers + mod->num_markers);
  #endif
+ #ifdef CONFIG_TRACEPOINTS
+ 		tracepoint_update_probe_range(mod->tracepoints,
+ 			mod->tracepoints + mod->num_tracepoints);
+ #endif
+ 	}
 +	dynamic_printk_setup(mod, sechdrs, verboseindex, secstrings);
  	err = module_finalize(hdr, sechdrs, mod);
  	if (err < 0)
  		goto cleanup;

Re: linux-next: manual merge of the ftrace tree

[Greg KH]

On Thu, Aug 21, 2008 at 01:09:03PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> [I have reported this previously but something has changed slightly.]
> 
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/module.c between commit bf8b9a59e335ca159aa4b3878ced0e94ea74cbc4
> ("driver core: basic infrastructure for per-module dynamic debug
> messages") from the driver-core tree and commit
> e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> from the ftrace tree.
> 
> Just overlapping additions.  I fixed it up (see below).

Merge looks good to me.

thanks,

greg k-h

Re: linux-next: manual merge of the ftrace tree

[Mathieu Desnoyers]

* Stephen Rothwell (sfr@canb.auug.org.au) wrote:
> Hi all,
> 
> [I have reported this previously but something has changed slightly.]
> 
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/module.c between commit bf8b9a59e335ca159aa4b3878ced0e94ea74cbc4
> ("driver core: basic infrastructure for per-module dynamic debug
> messages") from the driver-core tree and commit
> e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> from the ftrace tree.
> 

Looks good to me, thanks !

Mathieu

> Just overlapping additions.  I fixed it up (see below).
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> diff --cc kernel/module.c
> index b610466,6962348..0000000
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@@ -44,9 -44,9 +44,10 @@@
>   #include <linux/unwind.h>
>   #include <asm/uaccess.h>
>   #include <asm/cacheflush.h>
>  +#include <asm/sections.h>
>   #include <linux/license.h>
>   #include <asm/sections.h>
> + #include <linux/tracepoint.h>
>   
>   #if 0
>   #define DEBUGP printk
> @@@ -1866,7 -1832,8 +1867,9 @@@ static struct module *load_module(void 
>   #endif
>   	unsigned int markersindex;
>   	unsigned int markersstringsindex;
>  +	unsigned int verboseindex;
> + 	unsigned int tracepointsindex;
> + 	unsigned int tracepointsstringsindex;
>   	struct module *mod;
>   	long err = 0;
>   	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
> @@@ -2153,7 -2120,9 +2156,10 @@@
>   	markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
>    	markersstringsindex = find_sec(hdr, sechdrs, secstrings,
>   					"__markers_strings");
>  +	verboseindex = find_sec(hdr, sechdrs, secstrings, "__verbose");
> + 	tracepointsindex = find_sec(hdr, sechdrs, secstrings, "__tracepoints");
> + 	tracepointsstringsindex = find_sec(hdr, sechdrs, secstrings,
> + 					"__tracepoints_strings");
>   
>   	/* Now do relocations. */
>   	for (i = 1; i < hdr->e_shnum; i++) {
> @@@ -2203,8 -2179,11 +2216,12 @@@
>   		marker_update_probe_range(mod->markers,
>   			mod->markers + mod->num_markers);
>   #endif
> + #ifdef CONFIG_TRACEPOINTS
> + 		tracepoint_update_probe_range(mod->tracepoints,
> + 			mod->tracepoints + mod->num_tracepoints);
> + #endif
> + 	}
>  +	dynamic_printk_setup(mod, sechdrs, verboseindex, secstrings);
>   	err = module_finalize(hdr, sechdrs, mod);
>   	if (err < 0)
>   		goto cleanup;

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in
include/linux/ftrace.h between commit
9c24624727f6d6c460e45762a408ca5f5b9b8ef2 ("KSYM_SYMBOL_LEN fixes") from
Linus' tree and commit 3f5ec13696fd4a33bde42f385406cbb1d3cc96fd
("tracing/fastboot: move boot tracer structs and funcs into their own
header") from the ftrace tree.

The latter moved some code that the former fixed.  I fixed it up as best
I could (see below - I used the ftrace tree version of
include/linux/ftrace.h), but it should be checked and a merge with Linus'
tree done to resolve this conflict.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/include/trace/boot.h b/include/trace/boot.h
index 6b54537..3ec58b4 100644
--- a/include/trace/boot.h
+++ b/include/trace/boot.h
@@ -9,7 +9,7 @@
  */
 struct boot_trace_call {
 	pid_t			caller;
-	char			func[KSYM_NAME_LEN];
+	char			func[KSYM_SYMBOL_LEN];
 };
 
 /*
@@ -17,7 +17,7 @@ struct boot_trace_call {
  * while it returns.
  */
 struct boot_trace_ret {
-	char			func[KSYM_NAME_LEN];
+	char			func[KSYM_SYMBOL_LEN];
 	int				result;
 	unsigned long long	duration;		/* nsecs */
 };

Re: linux-next: manual merge of the ftrace tree

[Frédéric Weisbecker]

Hi Stephen,

2008/12/11 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in
> include/linux/ftrace.h between commit
> 9c24624727f6d6c460e45762a408ca5f5b9b8ef2 ("KSYM_SYMBOL_LEN fixes") from
> Linus' tree and commit 3f5ec13696fd4a33bde42f385406cbb1d3cc96fd
> ("tracing/fastboot: move boot tracer structs and funcs into their own
> header") from the ftrace tree.
>
> The latter moved some code that the former fixed.  I fixed it up as best
> I could (see below - I used the ftrace tree version of
> include/linux/ftrace.h), but it should be checked and a merge with Linus'
> tree done to resolve this conflict.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --git a/include/trace/boot.h b/include/trace/boot.h
> index 6b54537..3ec58b4 100644
> --- a/include/trace/boot.h
> +++ b/include/trace/boot.h
> @@ -9,7 +9,7 @@
>  */
>  struct boot_trace_call {
>        pid_t                   caller;
> -       char                    func[KSYM_NAME_LEN];
> +       char                    func[KSYM_SYMBOL_LEN];
>  };
>
>  /*
> @@ -17,7 +17,7 @@ struct boot_trace_call {
>  * while it returns.
>  */
>  struct boot_trace_ret {
> -       char                    func[KSYM_NAME_LEN];
> +       char                    func[KSYM_SYMBOL_LEN];
>        int                             result;
>        unsigned long long      duration;               /* nsecs */
>  };
>

Yes that's the right fix. The headers for the boot tracer have moved
for 2.6.29 merge window and the fix
should follow this move. If you agree, I will submit your patch to
latest -tip with the right "from " and
"signed-off-by" tags....

Re: linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi Frédéric,

On Thu, 11 Dec 2008 02:23:57 +0100 "Frédéric Weisbecker" <fweisbec@gmail.com> wrote:
>
> Yes that's the right fix. The headers for the boot tracer have moved
> for 2.6.29 merge window and the fix
> should follow this move. If you agree, I will submit your patch to
> latest -tip with the right "from " and
> "signed-off-by" tags....

Thanks, that would save me carrying it.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ftrace tree

[Ingo Molnar]

* Frédéric Weisbecker <fweisbec@gmail.com> wrote:

> >  struct boot_trace_ret {
> > -       char                    func[KSYM_NAME_LEN];
> > +       char                    func[KSYM_SYMBOL_LEN];
> >        int                             result;
> >        unsigned long long      duration;               /* nsecs */
> >  };
> >
> 
> Yes that's the right fix. The headers for the boot tracer have moved 
> for 2.6.29 merge window and the fix should follow this move. If you 
> agree, I will submit your patch to latest -tip with the right "from " 
> and "signed-off-by" tags....

i missed that bit indeed - so i've picked up your patch, thanks.

	Ingo

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ring_buffer.c between commit
4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion")
from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52
("ftrace: insert in the ftrace_preempt_disable()/enable() functions")
from the ftrace tree.

I am pretty sure that the latter supercedes the former, so I used that
version.  Please fix this conflict up in the ftrace tree soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ftrace tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in 
> kernel/trace/ring_buffer.c between commit 
> 4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion") 
> from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52 
> ("ftrace: insert in the ftrace_preempt_disable()/enable() functions") 
> from the ftrace tree.

Correct.

As usual, you can save yourself some work and take a look into or 
double-check tip/master for such resolutions - i pushed this conflict 
resolution out 4 days ago:

| commit 9e418deb22f9b19607823b1830a79138ebb3bd3c
| Merge: d477d0d... 4f5a7f4...
| Author: Ingo Molnar <mingo@elte.hu>
| Date:   Thu Nov 27 10:13:12 2008 +0100
|
|     Merge branch 'tracing/urgent'
|    
|    Conflicts:
|        kernel/trace/ring_buffer.c

(I shield you from most conflicts but it's not always possible and in 99% 
of the cases there's a resolution in tip/master already.)

> I am pretty sure that the latter supercedes the former, so I used that 
> version.  Please fix this conflict up in the ftrace tree soon.

Now that it has hit Linus's tree a couple of hours ago, i pushed it out 
into the ftrace-next tree as well.

Thanks Stephen,

	Ingo

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ftrace.c between commits
820432783190b4096499e38a4a4d7095c511913d ("ftrace: make filtered
functions effective on setting") and
32464779a1b8c15e9aa9aa0306b2f735080df9d8 ("ftrace: fix dyn ftrace filter
selection") from Linus' tree and commit ftrace_startup ("ftrace: add
quick function trace stop") from the ftrace tree.

I fixed it up (see below - which may not be correct) but it needs to be
fixed in the ftrace tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/trace/ftrace.c
index 78db083,beb21a5..0000000
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -526,8 -560,9 +553,8 @@@ static void ftrace_startup(void
  		return;
  
  	mutex_lock(&ftrace_start_lock);
- 	ftrace_start++;
+ 	ftrace_start_up++;
 -	if (ftrace_start_up == 1)
 -		command |= FTRACE_ENABLE_CALLS;
 +	command |= FTRACE_ENABLE_CALLS;
  
  	if (saved_ftrace_func != ftrace_trace_function) {
  		saved_ftrace_func = ftrace_trace_function;
@@@ -1181,7 -1212,7 +1208,7 @@@ ftrace_regex_release(struct inode *inod
  
  	mutex_lock(&ftrace_sysctl_lock);
  	mutex_lock(&ftrace_start_lock);
- 	if (ftrace_start && ftrace_enabled)
 -	if (iter->filtered && ftrace_start_up && ftrace_enabled)
++	if (ftrace_start_up && ftrace_enabled)
  		ftrace_run_update_code(FTRACE_ENABLE_CALLS);
  	mutex_unlock(&ftrace_start_lock);
  	mutex_unlock(&ftrace_sysctl_lock);

Re: linux-next: manual merge of the ftrace tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/trace/ftrace.c between commits
> 820432783190b4096499e38a4a4d7095c511913d ("ftrace: make filtered
> functions effective on setting") and
> 32464779a1b8c15e9aa9aa0306b2f735080df9d8 ("ftrace: fix dyn ftrace filter
> selection") from Linus' tree and commit ftrace_startup ("ftrace: add
> quick function trace stop") from the ftrace tree.
> 
> I fixed it up (see below - which may not be correct) but it needs to be
> fixed in the ftrace tree.

hm, latest tip/auto-ftrace-next has no merge commit with -git. But i 
reintegrated it about an hour before you sent this mail - maybe you've 
got the old branch still?

	Ingo

Re: linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi Ingo,

On Mon, 24 Nov 2008 03:11:34 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> hm, latest tip/auto-ftrace-next has no merge commit with -git. But i 
> reintegrated it about an hour before you sent this mail - maybe you've 
> got the old branch still?

Probably, but I expect everyone knows my schedule by now (my offer to
DaveM to sleep in was not serious :-)).

Anyway, I assume it is fixed for tomorrow and that is all I need, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in
arch/x86/kernel/traps.c between various commits now in Linus' tree and
various commits from the ftrace tree.

The result is a bit of a mess and really needs to be resolved by someone
who understands the changes involved.  So I have dropped the ftrace tree
for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ftrace tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in 
> arch/x86/kernel/traps.c between various commits now in Linus' tree and 
> various commits from the ftrace tree.
> 
> The result is a bit of a mess and really needs to be resolved by 
> someone who understands the changes involved.  So I have dropped the 
> ftrace tree for today.

yes - it's quite complex to merge it in its current state, i'll resolve 
that and reintegrate.

	Ingo

Re: linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi Ingo,

On Tue, 14 Oct 2008 08:26:52 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> yes - it's quite complex to merge it in its current state, i'll resolve 
> that and reintegrate.

Thanks

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
("driver core: basic infrastructure for per-module dynamic debug
messages") from the driver-core tree and commit
e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
from the ftrace tree.

Overlapping additions.  I fixed it up. Probably worth a look once I
publish the tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

Hi All,

On Fri, 15 Aug 2008 11:54:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
> ("driver core: basic infrastructure for per-module dynamic debug
> messages") from the driver-core tree and commit
> e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> from the ftrace tree.
> 
> Overlapping additions.  I fixed it up. Probably worth a look once I
> publish the tree.

Today this has expanded to include commit
be1c870c22e9b27170b5dd5028b6eaf2aab7b508 ("ftrace: enable mcount
recording for modules") also from the ftrace tree.  I have fixed it up as
below.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc kernel/module.c
index b610466,7426681..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -44,9 -44,10 +44,11 @@@
  #include <linux/unwind.h>
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
 +#include <asm/sections.h>
  #include <linux/license.h>
  #include <asm/sections.h>
+ #include <linux/tracepoint.h>
+ #include <linux/ftrace.h>
  
  #if 0
  #define DEBUGP printk
@@@ -1866,7 -1836,9 +1871,10 @@@ static struct module *load_module(void 
  #endif
  	unsigned int markersindex;
  	unsigned int markersstringsindex;
 +	unsigned int verboseindex;
+ 	unsigned int tracepointsindex;
+ 	unsigned int tracepointsstringsindex;
+ 	unsigned int mcountindex;
  	struct module *mod;
  	long err = 0;
  	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
@@@ -2153,7 -2126,12 +2162,13 @@@
  	markersindex = find_sec(hdr, sechdrs, secstrings, "__markers");
   	markersstringsindex = find_sec(hdr, sechdrs, secstrings,
  					"__markers_strings");
 +	verboseindex = find_sec(hdr, sechdrs, secstrings, "__verbose");
+ 	tracepointsindex = find_sec(hdr, sechdrs, secstrings, "__tracepoints");
+ 	tracepointsstringsindex = find_sec(hdr, sechdrs, secstrings,
+ 					"__tracepoints_strings");
+ 
+ 	mcountindex = find_sec(hdr, sechdrs, secstrings,
+ 			       "__mcount_loc");
  
  	/* Now do relocations. */
  	for (i = 1; i < hdr->e_shnum; i++) {
@@@ -2203,8 -2188,16 +2225,17 @@@
  		marker_update_probe_range(mod->markers,
  			mod->markers + mod->num_markers);
  #endif
+ #ifdef CONFIG_TRACEPOINTS
+ 		tracepoint_update_probe_range(mod->tracepoints,
+ 			mod->tracepoints + mod->num_tracepoints);
+ #endif
+ 	}
+ 
+ 	/* sechdrs[0].sh_size is always zero */
+ 	mseg = (void *)sechdrs[mcountindex].sh_addr;
+ 	ftrace_init_module(mseg, mseg + sechdrs[mcountindex].sh_size);
+ 
 +	dynamic_printk_setup(mod, sechdrs, verboseindex, secstrings);
  	err = module_finalize(hdr, sechdrs, mod);
  	if (err < 0)
  		goto cleanup;

Re: linux-next: manual merge of the ftrace tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi All,
> 
> On Fri, 15 Aug 2008 11:54:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in
> > kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
> > ("driver core: basic infrastructure for per-module dynamic debug
> > messages") from the driver-core tree and commit
> > e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> > from the ftrace tree.
> > 
> > Overlapping additions.  I fixed it up. Probably worth a look once I
> > publish the tree.
> 
> Today this has expanded to include commit 
> be1c870c22e9b27170b5dd5028b6eaf2aab7b508 ("ftrace: enable mcount 
> recording for modules") also from the ftrace tree.  I have fixed it up 
> as below.

Thanks Stephen. I suspect there's not much we can do at this point to 
resolve this conflict sooner than at the linux-next level, as Rusty uses 
Quilt queues.

	Ingo

Re: linux-next: manual merge of the ftrace tree

[Stephen Rothwell]

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

Hi Ingo,

On Mon, 25 Aug 2008 11:16:43 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > On Fri, 15 Aug 2008 11:54:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the ftrace tree got a conflict in
> > > kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
> > > ("driver core: basic infrastructure for per-module dynamic debug
> > > messages") from the driver-core tree and commit
> > > e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> > > from the ftrace tree.
> > > 
> > > Overlapping additions.  I fixed it up. Probably worth a look once I
> > > publish the tree.
> > 
> > Today this has expanded to include commit 
> > be1c870c22e9b27170b5dd5028b6eaf2aab7b508 ("ftrace: enable mcount 
> > recording for modules") also from the ftrace tree.  I have fixed it up 
> > as below.
> 
> Thanks Stephen. I suspect there's not much we can do at this point to 
> resolve this conflict sooner than at the linux-next level, as Rusty uses 
                                                                ^^^^^
I assume you mean Greg.

> Quilt queues.

But yeah, not much we can do, but it is not a problem.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]