Message ID | cf329845-48ee-4b25-9b5a-02a6e2b55e5a@linuxfoundation.org |
---|---|
State | New |
Headers | show |
Series | [GIT,PULL,GIT,PULL] cpupower fixes for Linux 6.12-rc1 | expand |
On Mon, 23 Sept 2024 at 13:19, Shuah Khan <skhan@linuxfoundation.org> wrote: > > Please send this up to Linus if at all possible before the merge > window closes. Bah, I took it directly, since it was in my mailbox and was lit up like a christmas tree because it triggered my git pull search criteria. Linus
On 9/24/24 14:01, Linus Torvalds wrote: > On Mon, 23 Sept 2024 at 13:19, Shuah Khan <skhan@linuxfoundation.org> wrote: >> >> Please send this up to Linus if at all possible before the merge >> window closes. > > Bah, I took it directly, since it was in my mailbox and was lit up > like a christmas tree because it triggered my git pull search > criteria. > > Linus Your git pull search criteria got some workout looks like. :) Is it all good after the lighting up or should it go through the normal channels through the pm tree? thanks, -- Shuah
On Tue, 24 Sept 2024 at 13:18, Shuah Khan <skhan@linuxfoundation.org> wrote: > > Is it all good after the lighting up or should it go through > the normal channels through the pm tree? It's all good and pushed out. Linus
The pull request you sent on Mon, 23 Sep 2024 14:19:01 -0600:
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.12-rc1-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7f8de2bf072530a48f53a5658db8528af598b75f
Thank you!
diff --git a/tools/power/cpupower/bindings/python/.gitignore b/tools/power/cpupower/bindings/python/.gitignore index 5c9a1f0212dd..51cbb8799c44 100644 --- a/tools/power/cpupower/bindings/python/.gitignore +++ b/tools/power/cpupower/bindings/python/.gitignore @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only __pycache__/ raw_pylibcpupower_wrap.c *.o *.so *.py !test_raw_pylibcpupower.py -# git keeps ignoring this file, use git add -f raw_libcpupower.i -!raw_pylibcpupower.i diff --git a/tools/power/cpupower/bindings/python/Makefile b/tools/power/cpupower/bindings/python/Makefile index dc09c5b66ead..e1ebb1d60cd4 100644 --- a/tools/power/cpupower/bindings/python/Makefile +++ b/tools/power/cpupower/bindings/python/Makefile @@ -20,13 +20,13 @@ _raw_pylibcpupower.so: raw_pylibcpupower_wrap.o raw_pylibcpupower_wrap.o: raw_pylibcpupower_wrap.c $(CC) -fPIC -c raw_pylibcpupower_wrap.c $(PY_INCLUDE) -raw_pylibcpupower_wrap.c: raw_pylibcpupower.i +raw_pylibcpupower_wrap.c: raw_pylibcpupower.swg ifeq ($(HAVE_SWIG),0) $(error "swig was not found. Make sure you have it installed and in the PATH to generate the bindings.") else ifeq ($(HAVE_PYCONFIG),0) $(error "python-config was not found. Make sure you have it installed and in the PATH to generate the bindings.") endif - swig -python raw_pylibcpupower.i + swig -python raw_pylibcpupower.swg # Will only clean the bindings folder; will not clean the actual cpupower folder clean: diff --git a/tools/power/cpupower/bindings/python/raw_pylibcpupower.i b/tools/power/cpupower/bindings/python/raw_pylibcpupower.swg similarity index 100% rename from tools/power/cpupower/bindings/python/raw_pylibcpupower.i rename to tools/power/cpupower/bindings/python/raw_pylibcpupower.swg