From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755366AbcGHNXl (ORCPT <rfc822;w@1wt.eu>);
	Fri, 8 Jul 2016 09:23:41 -0400
Received: from mail-pa0-f67.google.com ([209.85.220.67]:33642 "EHLO
	mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754947AbcGHNXd (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 8 Jul 2016 09:23:33 -0400
Date: Fri, 8 Jul 2016 15:23:29 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
        Kan Liang <kan.liang@intel.com>, Thomas Gleixner <tglx@linutronix.de>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Stephane Eranian <eranian@google.com>,
        Vince Weaver <vincent.weaver@maine.edu>
Subject: Re: [PATCH] x86/perf/intel/rapl: Fix module name collision with
 powercap intel-rapl
Message-ID: <20160708132329.GA1640@gmail.com>
References: <1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com>
 <20160706090404.GJ4329@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20160706090404.GJ4329@intel.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:

> On Thu, Jun 23, 2016 at 06:06:49PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > 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

Thanks,

	Ingo