diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 13:29:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 13:29:34 -0800 |
| commit | 9c70f046787505127f2f8bb60ad24bb3c8bfc61a (patch) | |
| tree | 46a6df4909b071db9a067309e726841ba7823505 /MAINTAINERS | |
| parent | ae1c1a8fd9c3f504b390df26b4af8ef6bfde005e (diff) | |
| parent | f77f420d34754b8d08ac6ebf094ff7193023196a (diff) | |
Merge tag 'x86_misc_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 updates from Borislav Petkov:
"The main part of this branch is the ongoing fight against windmills in
an attempt to have userspace tools not poke at naked MSRs.
This round deals with MSR_IA32_ENERGY_PERF_BIAS and removes direct
poking into it by our in-tree tools in favor of the proper
"energy_perf_bias" sysfs interface which we already have.
In addition, the msr.ko write filtering's error message points to a
new summary page which contains the info we collected from helpful
reporters about which userspace tools write MSRs:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/about
along with the current status of their conversion.
The rest is the usual small fixes and improvements"
* tag 'x86_misc_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/msr: Add a pointer to an URL which contains further details
x86/pci: Fix the function type for check_reserved_t
selftests/x86: Add missing .note.GNU-stack sections
selftests/x86/fsgsbase: Fix GS == 1, 2, and 3 tests
x86/msr: Downgrade unrecognized MSR message
x86/msr: Do not allow writes to MSR_IA32_ENERGY_PERF_BIAS
tools/power/x86_energy_perf_policy: Read energy_perf_bias from sysfs
tools/power/turbostat: Read energy_perf_bias from sysfs
tools/power/cpupower: Read energy_perf_bias from sysfs
MAINTAINERS: Cleanup SGI-related entries
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3a58691d6602..2bdd87123060 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15905,13 +15905,14 @@ F: include/linux/sfp.h K: phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate) SGI GRU DRIVER -M: Dimitri Sivanich <sivanich@sgi.com> +M: Dimitri Sivanich <dimitri.sivanich@hpe.com> S: Maintained F: drivers/misc/sgi-gru/ SGI XP/XPC/XPNET DRIVER -M: Cliff Whickman <cpw@sgi.com> M: Robin Holt <robinmholt@gmail.com> +M: Steve Wahl <steve.wahl@hpe.com> +R: Mike Travis <mike.travis@hpe.com> S: Maintained F: drivers/misc/sgi-xp/ @@ -19166,6 +19167,7 @@ F: arch/x86/platform X86 PLATFORM UV HPE SUPERDOME FLEX M: Steve Wahl <steve.wahl@hpe.com> +R: Mike Travis <mike.travis@hpe.com> R: Dimitri Sivanich <dimitri.sivanich@hpe.com> R: Russ Anderson <russ.anderson@hpe.com> S: Supported |