From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753316AbbDMHy7 (ORCPT ); Mon, 13 Apr 2015 03:54:59 -0400 Received: from mga03.intel.com ([134.134.136.65]:16525 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbbDMHy5 convert rfc822-to-8bit (ORCPT ); Mon, 13 Apr 2015 03:54:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,568,1422950400"; d="scan'208";a="712751983" From: "Grumbach, Emmanuel" To: Stephen Rothwell , Steven Rostedt , David Miller , "netdev@vger.kernel.org" CC: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: linux-next: manual merge of the ftrace tree with the net-next tree Thread-Topic: linux-next: manual merge of the ftrace tree with the net-next tree Thread-Index: AQHQdb7WxmW5GW+6F0ubab+qc+JPpp1Kko3A Date: Mon, 13 Apr 2015 07:54:52 +0000 Message-ID: <0BA3FCBA62E2DC44AF3030971E174FB31B6CE461@hasmsx107.ger.corp.intel.com> References: <20150413175224.73a9baff@canb.auug.org.au> In-Reply-To: <20150413175224.73a9baff@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.184.70.11] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > > Hi Steven, > > Today's linux-next merge of the ftrace tree got a conflict in > drivers/net/wireless/iwlwifi/iwl-devtrace.h between commit 7e1223b50089 > ("iwlwifi: mvm: new Alive / error table API") from the net-next tree and > commit c5ef935d01a2 ("iwlwifi: Move each system tracepoints to their own > header") from the ftrace tree. > > I fixed it up (see patch below, since this code was moved to a new file) and > can carry the fix as necessary (no action is required). Yes - So I was discussing that with Steven and you fixed it properly. Thank your for that. > > From: Stephen Rothwell > Date: Mon, 13 Apr 2015 17:21:30 +1000 > Subject: [PATCH] iwlwifi: mvm: fix up for tracing split > > Signed-off-by: Stephen Rothwell > --- > drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h > b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h > index 6cb66a988271..223b8752f924 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h > +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h > @@ -116,11 +116,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, > TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low, > u32 data1, u32 data2, u32 line, u32 blink1, > u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time, > - u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver, > + u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 > hw_ver, > u32 brd_ver), > TP_ARGS(dev, desc, tsf_low, data1, data2, line, > blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2, > - gp3, ucode_ver, hw_ver, brd_ver), > + gp3, major, minor, hw_ver, brd_ver), > TP_STRUCT__entry( > DEV_ENTRY > __field(u32, desc) > @@ -136,7 +136,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, > __field(u32, gp1) > __field(u32, gp2) > __field(u32, gp3) > - __field(u32, ucode_ver) > + __field(u32, major) > + __field(u32, minor) > __field(u32, hw_ver) > __field(u32, brd_ver) > ), > @@ -155,21 +156,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, > __entry->gp1 = gp1; > __entry->gp2 = gp2; > __entry->gp3 = gp3; > - __entry->ucode_ver = ucode_ver; > + __entry->major = major; > + __entry->minor = minor; > __entry->hw_ver = hw_ver; > __entry->brd_ver = brd_ver; > ), > TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, " > "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X " > - "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X > " > - "hw 0x%08X brd 0x%08X", > + "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X > " > + "minor 0x%08X hw 0x%08X brd 0x%08X", > __get_str(dev), __entry->desc, __entry->tsf_low, > __entry->data1, > __entry->data2, __entry->line, __entry->blink1, > __entry->blink2, __entry->ilink1, __entry->ilink2, > __entry->bcon_time, __entry->gp1, __entry->gp2, > - __entry->gp3, __entry->ucode_ver, __entry->hw_ver, > - __entry->brd_ver) > + __entry->gp3, __entry->major, __entry->minor, > + __entry->hw_ver, __entry->brd_ver) > ); > > TRACE_EVENT(iwlwifi_dev_ucode_event, > -- > 2.1.4 > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au