From: Steven Rostedt <rostedt@goodmis.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ben Dooks <ben.dooks@codethink.co.uk>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the ftrace tree with the tip tree
Date: Wed, 27 Nov 2019 20:00:22 -0500 [thread overview]
Message-ID: <20191127200022.4e90beb8@gandalf.local.home> (raw)
In-Reply-To: <20191128114704.7d705a98@canb.auug.org.au>
On Thu, 28 Nov 2019 11:47:04 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 21 Nov 2019 15:10:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in:
> >
> > kernel/trace/trace_export.c
> >
> > between commit:
> >
> > 60fdad00827c ("ftrace: Rework event_create_dir()")
> >
> > from the tip tree and commit:
> >
> > 6dff4d7dd3e0 ("tracing: Make internal ftrace events static")
> >
> > 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 kernel/trace/trace_export.c
> > index 6d64c1c19fd5,2e6d2e9741cc..000000000000
> > --- a/kernel/trace/trace_export.c
> > +++ b/kernel/trace/trace_export.c
> > @@@ -142,10 -168,12 +142,10 @@@ static struct trace_event_fields ftrace
> > #define F_printk(fmt, args...) __stringify(fmt) ", " __stringify(args)
> >
> > #undef FTRACE_ENTRY_REG
> > -#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
> > - regfn) \
> > - \
> > +#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, regfn) \
> > - struct trace_event_class __refdata event_class_ftrace_##call = { \
> > + static struct trace_event_class __refdata event_class_ftrace_##call = { \
> > .system = __stringify(TRACE_SYSTEM), \
> > - .define_fields = ftrace_define_fields_##call, \
> > + .fields_array = ftrace_event_fields_##call, \
> > .fields = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\
> > .reg = regfn, \
> > }; \
>
> This is now a conflict between the tip tree and Linus' tree.
This looks to be a trivial conflict, as the change in the ftrace (now
Linus's) tree just makes event_class_ftrace_##call static, and
shouldn't interfere with the changes in tip.
-- Steve
next prev parent reply other threads:[~2019-11-28 1:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 4:10 linux-next: manual merge of the ftrace tree with the tip tree Stephen Rothwell
2019-11-28 0:47 ` Stephen Rothwell
2019-11-28 1:00 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-07 1:39 Stephen Rothwell
2021-03-22 3:45 Stephen Rothwell
2016-09-07 5:25 Stephen Rothwell
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=20191127200022.4e90beb8@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=ben.dooks@codethink.co.uk \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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).