Skip to content

Commit

Permalink
Merge tag 'linux-cpupower-5.10-rc1' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/kernel/git/shuah/linux

Pull cpupower utility updates for 5.10-rc1 from Shuah Khan:

"This update consists of minor fixes for spelling and speeding up
 generating git version string which will in turn speed up compiles."

* tag 'linux-cpupower-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: speed up generating git version string
  cpupowerutils: fix spelling mistake "dependant" -> "dependent"
  • Loading branch information
Rafael J. Wysocki committed Oct 16, 2020
2 parents 0b8417c + 527b777 commit 79d6c40
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/power/cpupower/Makefile
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ DESTDIR ?=
# Package-related definitions. Distributions can modify the version
# and _should_ modify the PACKAGE_BUGREPORT definition

VERSION= $(shell ./utils/version-gen.sh)
VERSION:= $(shell ./utils/version-gen.sh)
LIB_MAJ= 0.0.1
LIB_MIN= 0

2 changes: 1 addition & 1 deletion tools/power/cpupower/debug/i386/intel_gsic.c
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ int main (void)
printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n");
printf("\nUnfortunately, you have to know what exactly are "
"smi_cmd and smi_port, and this\nis system "
"dependant.\n");
"dependent.\n");
}
return 1;
}

0 comments on commit 79d6c40

Please sign in to comment.