Re: [PATCH] iwlwifi: Move each system tracepoints to their own header

[Emmanuel Grumbach]

it's me again.

On Mon, Apr 13, 2015 at 9:22 AM, Emmanuel Grumbach <egrumbach@xxxxxxxxx> wrote:
> On Sun, Apr 12, 2015 at 8:37 PM, Emmanuel Grumbach <egrumbach@xxxxxxxxx> wrote:
>> On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg
>> <johannes@xxxxxxxxxxxxxxxx> 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 new code in the ftrace infrastructure.
>>>> Moving each of these TRACE_SYSTEMs into their own trace file with
>>>> just one TRACE_SYSTEM per file fixes the issue.
>>>>
>>>> Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
>>>> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
>>>
>>>
>>>>  drivers/net/wireless/iwlwifi/iwl-devtrace-data.h   |  79 ++++
>>>>  drivers/net/wireless/iwlwifi/iwl-devtrace-io.h     | 155 ++++++++
>>>>  .../net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h    | 200 ++++++++++
>>>>  drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h    |  97 +++++
>>>>  drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h  |  81 ++++
>>>>  drivers/net/wireless/iwlwifi/iwl-devtrace.h        | 438 +--------------------
>>>>  6 files changed, 618 insertions(+), 432 deletions(-)
>>>>  create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-data.h
>>>>  create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-io.h
>>>>  create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
>>>>  create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h
>>>>  create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h
>>>
>>> Looks good to me.
>>>
>>> Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
>>>
>>
>> I had to make quite a few modifications since this patch was not based
>> on iwlwifi-next, but I picked it up in our internal tree.
>
> Wait - you seemed to want to apply that on your tree because of
> dependencies (which I can understand). So how do you suggest to
> proceed?
> You can apply your original version of the patch on your tree, but
> then it'll collapse when it'll meet iwlwifi-next.git.
> I can try to have the modified version of the patch into 4.1 but I
> doubt I'll make it. If I do make it, it'd allow you to work on top of
> 4.1 whenever that'll be ready? What is your timeline?
>

I overthought it. Stephen fixed the conflict correctly.

> Or maybe you can pull iwlwifi-next (which would be odd I have to say)?
> What do you suggest?
> FWIW - I am talking about:
>
> commit 7e1223b50089ab5901215d2fd8c61b42c7cfe034
> Author: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
> Date:   Tue Feb 3 20:11:48 2015 +0200
>
>     iwlwifi: mvm: new Alive / error table API
>
>     The new API slightly changes the layout of the version of
>     the firmware - prepare for that.
>
>     Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/