From patchwork Mon Sep 23 20:19:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 13809957 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9A5017BD6 for ; Mon, 23 Sep 2024 20:19:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727122747; cv=none; b=K3VfaXANtabTQAf4odRqi0bEUGbBz3xT+3w/Rlbd3ltUZCz84ERa7Atn3biNVTaHY652zFbPK9lizRRKEkkkZhSdQ7AoFRTWqVcgVtMwBzYvpkHz/u79p/PXiegUx2oaxJ2opONb8uPi1VLvV299YE1/3T9v8rEt+kY2uaT6XWM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727122747; c=relaxed/simple; bh=/eSZTXDrWxp8WU3PcAncNTF6Ub7hlLotegTJAsNx5NU=; h=Content-Type:Message-ID:Date:MIME-Version:To:Cc:From:Subject; b=r6CkrBCreDALRBqqb0o3ZVXJyzfvDPIb2maXznTQb1/z43D3R9LjHLaLOnTSRq+0h1t9unOYR7q95TOJY4rbyXABMTcddxxsRkfmAYpvQcMbhmJNQpj/D3oAM7uyhohsb04EokBLRvIGpmlMki6fvecWdF7FzmJe5SyicPsngRc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h0rpA66u; arc=none smtp.client-ip=209.85.166.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="h0rpA66u" Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-82a109bc459so206424739f.1 for ; Mon, 23 Sep 2024 13:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1727122744; x=1727727544; darn=vger.kernel.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=DWGul8N+EZy00peKKJT500hgW+GLPhHSqZNfkf+uAl8=; b=h0rpA66usVBN2vYmrxB77XTaXVwp84kx3DW0yu8BAu702bS+QndSXkaRZo4aKSK/z3 0ajTUNjKUilzBhLIzJDbVMvh/65AEq5Bwb+BAhcp3NmNvIhzrzAkhWMohnhOPi4QBQkq nMi74n3TTdaOSqSmtvxy94ak82G9mrFnVzTjM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727122744; x=1727727544; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DWGul8N+EZy00peKKJT500hgW+GLPhHSqZNfkf+uAl8=; b=GSmtT+pBAIO5A1L0+Po0LwVuoE1oohFc8uuhEvyfXXy47bRFRvwuSUGuF3PaBcpkqq CWHZYqJ08B2hWgvrDHuNWxeyw3kqmK81W0GAiTzyDwLvuQkvK4DbsHefjTi5Igjhg5OZ Lird0bQf8qgEk6QM48UPoFeaa9YjUW8G1F7b2mdJxVJ7/ABKJYPqV0Qir4WNlQotjPFk 4qHp9itgcrUKrhP8zkMHfRv+XKFYp4DpvOiNpkQ4PhsxIX8SzMbuxtRjUctCwEwPNPi/ Gv+oa7QSMhuhq+3x2dsKXHkuTvZOVkt5KDSDx4DSTsNLu5/aPY3t83rYINuXZCajWFDH 1+Dw== X-Forwarded-Encrypted: i=1; AJvYcCUMEEXz1I8hZBU2aSoDi+vAsTGIvYx5hT+IWHwiMG7Aqt0lEH51S/W5Ls+ZqMapm7sZYcUELe07Eg==@vger.kernel.org X-Gm-Message-State: AOJu0YwNLs3t/ahznP50DXWpw52xFoJgrZMyLgnnOqb12WPHZTIusDfO YeW8hIy+GTwNV/b7RQxAs2cHrOVGNE/Uxt4na0BLf5kLb4ns8my4ZPo30MuzurY= X-Google-Smtp-Source: AGHT+IHAp0QTMm7T/66VhAN9fo2hkuaNPKT29AKjYiwTUac4Fpmd+C6TbAgSOlaKv5WqEeG+sLXybg== X-Received: by 2002:a05:6e02:156c:b0:3a0:9030:e70b with SMTP id e9e14a558f8ab-3a1a2fec392mr9011545ab.4.1727122743800; Mon, 23 Sep 2024 13:19:03 -0700 (PDT) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4d40f2f6e2asm24140173.154.2024.09.23.13.19.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 23 Sep 2024 13:19:02 -0700 (PDT) Message-ID: Date: Mon, 23 Sep 2024 14:19:01 -0600 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "Rafael J. Wysocki" Cc: shuah , Shuah Khan , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , Guenter Roeck , "John B. Wyatt IV" , Shuah Khan From: Shuah Khan Subject: [GIT PULL] [GIT PULL] cpupower fixes for Linux 6.12-rc1 Hi Rafael, Please pull the following cpupower fixes update for Linux 6.12-rc1. Please send this up to Linus if at all possible before the merge window closes. This cpupower fixes update consists fix to raw_pylibcpupower.i being removed by "make mrproper". "*.i", "*.o" files are generated during kernel compile and removed when the repo is cleaned by mrproper. The file is renamed to use .swg extension instead to avoid the problem. The second patch removes references to raw_pylibcpupower.i from .gitignore. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 80e67f1802d0fc21543216557a68320c71d7dbe1: pm:cpupower: Add error warning when SWIG is not installed (2024-09-06 10:58:35 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.12-rc1-fixes for you to fetch changes up to 6c56fb4434f59df9c777eded5f77cc812882cef3: pm: cpupower: Clean up bindings gitignore (2024-09-23 09:06:03 -0600) ---------------------------------------------------------------- linux-cpupower-6.12-rc1-fixes This cpupower fixes update consists fix to raw_pylibcpupower.i being removed by "make mrproper". "*.i", "*.o" files are generated during kernel compile and removed when the repo is cleaned by mrproper. The file is renamed to use .swg extension instead to avoid the problem. The second patch removes references to raw_pylibcpupower.i from .gitignore. ---------------------------------------------------------------- John B. Wyatt IV (1): pm: cpupower: Clean up bindings gitignore Min-Hua Chen (1): pm: cpupower: rename raw_pylibcpupower.i tools/power/cpupower/bindings/python/.gitignore | 3 +-- tools/power/cpupower/bindings/python/Makefile | 4 ++-- .../bindings/python/{raw_pylibcpupower.i => raw_pylibcpupower.swg} | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename tools/power/cpupower/bindings/python/{raw_pylibcpupower.i => raw_pylibcpupower.swg} (100%) ---------------------------------------------------------------- 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