On Mon, 13 Apr 2015 11:17:17 +0300
Emmanuel Grumbach wrote:
> I overthought it. Stephen fixed the conflict correctly.
>
Good, because I needed that change in my tree as other patches depended
on it.
Linus should be able to figure this out. I'll have to write up a bit
for him when I do my pull
it's me again.
On Mon, Apr 13, 2015 at 9:22 AM, Emmanuel Grumbach wrote:
> On Sun, Apr 12, 2015 at 8:37 PM, Emmanuel Grumbach
> wrote:
>> On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg
>> wrote:
>>> On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote:
Every tracing file must have its
On Sun, Apr 12, 2015 at 8:37 PM, Emmanuel Grumbach wrote:
> On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg
> wrote:
>> On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote:
>>> Every tracing file must have its own TRACE_SYSTEM defined.
>>> The iwlwifi tracepoint header broke this and added in
On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg
wrote:
> On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote:
>> Every tracing file must have its own TRACE_SYSTEM defined.
>> The iwlwifi tracepoint header broke this and added in the middle
>> of the file:
> [...]
>> Unfortunately, this broke ne
On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote:
> Every tracing file must have its own TRACE_SYSTEM defined.
> The iwlwifi tracepoint header broke this and added in the middle
> of the file:
[...]
> Unfortunately, this broke new code in the ftrace infrastructure.
> Moving each of these TRA
Every tracing file must have its own TRACE_SYSTEM defined.
The iwlwifi tracepoint header broke this and added in the middle
of the file:
#undef TRACE_SYSTEM
#define TRACE_SYSTEM iwlwifi_io
#undef TRACE_SYSTEM
#define TRACE_SYSTEM iwlwifi_ucode
#undef TRACE_SYSTEM
#define TRACE_SYSTEM iwlw
