From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbcGHOKv (ORCPT ); Fri, 8 Jul 2016 10:10:51 -0400 Received: from mga03.intel.com ([134.134.136.65]:8161 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754911AbcGHOKo (ORCPT ); Fri, 8 Jul 2016 10:10:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,330,1464678000"; d="scan'208";a="1018042623" Date: Fri, 8 Jul 2016 17:09:57 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Kan Liang , Thomas Gleixner , Alexander Shishkin , Arnaldo Carvalho de Melo , Jiri Olsa , Linus Torvalds , Peter Zijlstra , Stephane Eranian , Vince Weaver Subject: Re: [PATCH] x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl Message-ID: <20160708140957.GT4329@intel.com> References: <1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com> <20160706090404.GJ4329@intel.com> <20160708132329.GA1640@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160708132329.GA1640@gmail.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 08, 2016 at 03:23:29PM +0200, Ingo Molnar wrote: > > * Ville Syrjälä wrote: > > > On Thu, Jun 23, 2016 at 06:06:49PM +0300, ville.syrjala@linux.intel.com wrote: > > > From: Ville Syrjälä > > > > > > Since commit 4b6e2571bf00 ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular") > > > the rapl perf module calls itself intel-rapl. That name was > > > already in use by the rapl powercap driver, which now fails to > > > load if the perf module is loaded. Fix the problem by renaming the > > > perf module to intel-rapl-perf, so that both modules can coexist. > > > > Ping? > > It's in perf/urgent: > > # 175a20c16fdb x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl Cool. Thanks. -- Ville Syrjälä Intel OTC