Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbbDMIR0 (ORCPT ); Mon, 13 Apr 2015 04:17:26 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:36274 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402AbbDMIRT (ORCPT ); Mon, 13 Apr 2015 04:17:19 -0400 MIME-Version: 1.0 In-Reply-To: References: <20150406231357.2b8e452d@grimm.local.home> <1428389938.1841.1.camel@sipsolutions.net> <20150407102146.216cf90b@gandalf.local.home> <20150407121319.72d69ec5@gandalf.local.home> <1428479094.2809.3.camel@sipsolutions.net> Date: Mon, 13 Apr 2015 11:17:17 +0300 Message-ID: Subject: Re: [PATCH] iwlwifi: Move each system tracepoints to their own header From: Emmanuel Grumbach To: Johannes Berg Cc: Steven Rostedt , LKML , linux-wireless Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3174 Lines: 71 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 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 >>>> Signed-off-by: Steven Rostedt >>> >>> >>>> 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 >>> >> >> 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 > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/