Maintainer: * Tobias Klauser * Daniel Borkmann Former maintainer: * Emmanuel Roullit Major contributors (> 30 commits): * Daniel Borkmann * Tobias Klauser * Emmanuel Roullit * Markus Amend * Christoph Jaeger * Herbert Haas * * Vadim Kochan * Jon Schipp Minor contributors (<= 30 commits, sorted alphabetically): * Arch3y * Christian Wiese * Dan Horák * Dennis Gilmore * Doug Burks * Eric Dumazet * Erik Bengtsson * Hideo Hattori * Hisao Tanabe * James McCoy * Jaroslav Škarvada * Jesper Dangaard Brouer * Jim Binder * Kartik Mistry * Ken-ichirou MATSUZAWA * Mark Latimer * Markus Kötter * Martin Hauke * Michał Purzyński * Oliver Smith * Paolo Abeni * Peter Stuge * Reiner Herrmann * Ronald W. Henderson * Scott Moeller * Sibir Chakraborty * Stefan Seering * Stephen Wadeley * Teguh * Tillmann Karras * Tobias Geerinckx-Rice * Tommy Beadle * Ulrich Weber * wilson Special thanks to some of our sponsors: * Deutsche Flugsicherung GmbH * ETH Zurich, Communications Systems Group * Max Planck Institute for Human Cognitive and Brain Sciences * Team Cymru Notes: The order of authors with > 30 commits listed here is sorted by contributions from high to low through ``git log --no-merges $@ | grep Author: | \ cut -d: -f2 | cut -d\< -f1 | sort | uniq -c | sort -n -r''. The list of minor contributors is currently unsorted and contains people who have contributed code ``in some way'' (e.g. on the upstream or maintenance repositories), either through Git or email. Note that we have taken over the maintenance and further development of Herbert Haas' mausezahn [ˈmauzəˌtsa:n] utility after he passed away in 2011. There were no Git commit statistics available from the import of his project. The project is currently in a staging area, but will be fully integrated soon. (*) Want to join the core team? Submit enough great patches over a long time, implement what's on the TODO file and show an ongoing, active interest in supporting netsniff-ng. What's in it for you? If you ever come to Switzerland, you get a free beer on Daniel and you can meet some great people involved in this project. ;) on value='3' selected='selected'>3space:mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2016-06-23 18:06:49 +0300
committerThomas Gleixner <tglx@linutronix.de>2016-07-06 12:51:59 +0200
commit175a20c16fdb7700fcac63f1eeb2caa7e1dddd2d (patch)
tree029776255c9ecf5fbc72fc4b12570a1fa5338e83
parentfc18822510721fe694d273c5211c71ea52796d76 (diff)
x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl
Since commit 4b6e2571bf00 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. Fixes: 4b6e2571bf00 ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Kan Liang <kan.liang@intel.com> Cc: Stephane Eranian <eranian@google.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/r/1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat