Skip to content

Commit

Permalink
env: next-20231212
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
nathanchance committed Dec 12, 2023
1 parent 2aa8ced commit c8a1789
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 4 deletions.
2 changes: 2 additions & 0 deletions fish/functions/cbl_rb_fd.fish
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ function cbl_rb_fd -d "Rebase generic Fedora kernel on latest linux-next"
for revert in $reverts
git revert --mainline 1 --no-edit $revert; or return
end
set -a b4_patches https://lore.kernel.org/all/[email protected]/ # ASoC: cs42l43: Add missing statics for hp_ilimit functions
set -a b4_patches https://lore.kernel.org/all/[email protected]/ # rpm-pkg: simplify installkernel %post
for patch in $b4_patches
b4 shazam -l -P _ -s $patch; or return
end
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] ASoC: cs42l43: Add missing statics for hp_ilimit functions
From: Charles Keepax <[email protected]>
Date: Tue, 12 Dec 2023 10:41:49 +0000
Message-Id: <[email protected]>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Fixes: bbbc18d8c27c ("ASoC: cs42l43: Allow HP amp to cool off after current limit")
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Charles Keepax <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
sound/soc/codecs/cs42l43.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c
index d2412dab35996..6a64681767de8 100644
--- a/sound/soc/codecs/cs42l43.c
+++ b/sound/soc/codecs/cs42l43.c
@@ -139,7 +139,7 @@ CS42L43_IRQ_ERROR(spkl_therm_warm)
CS42L43_IRQ_ERROR(spkr_sc_detect)
CS42L43_IRQ_ERROR(spkl_sc_detect)

-void cs42l43_hp_ilimit_clear_work(struct work_struct *work)
+static void cs42l43_hp_ilimit_clear_work(struct work_struct *work)
{
struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,
hp_ilimit_clear_work.work);
@@ -156,7 +156,7 @@ void cs42l43_hp_ilimit_clear_work(struct work_struct *work)
snd_soc_dapm_mutex_unlock(dapm);
}

-void cs42l43_hp_ilimit_work(struct work_struct *work)
+static void cs42l43_hp_ilimit_work(struct work_struct *work)
{
struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,
hp_ilimit_work);
--
2.39.2

6 changes: 4 additions & 2 deletions pkgbuilds/linux-next-llvm/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

_localversion=-llvm
pkgname=linux-next$_localversion
_srctag=next-20231211
_srctag=next-20231212
pkgver=${_srctag//-/.}
pkgrel=1
pkgdesc='linux-next'
Expand All @@ -23,14 +23,16 @@ options=('!strip')
source=(
"$pkgname::git+https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git?signed#tag=$_srctag"
config
20231212_ckeepax_asoc_cs42l43_add_missing_statics_for_hp_ilimit_functions.patch
)

validpgpkeys=(
'985B681FA45919699753A26489F91C0A41D5C07A' # Stephen Rothwell
'3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB' # Mark Brown
)
sha256sums=('SKIP'
'6e4ce31bf94f9634b117ae5b025cc0bd4fcbd657ca3bb69a1238fc7d2bc82b44')
'69675dbae7efb48fb8ae6b83948ad4ef6179f488f2de143b115790078a523615'
'ff17374971a03d0822b999b3f0243c0b6e76246ed71759e37309687bd844cc08')

# This obviously ties this PKGBUILD to my machine but that is kind of the point :)
_kmake() {
Expand Down
7 changes: 5 additions & 2 deletions pkgbuilds/linux-next-llvm/config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.7.0-rc4 Kernel Configuration
# Linux/x86 6.7.0-rc5 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0git (https://github.com/llvm/llvm-project 13b88265088329decd15449e3b2461a6177174b2)"
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0git (https://github.com/llvm/llvm-project 6ed1daa0c9413bf63c2bd1f113bba4fb119f2b2b)"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
CONFIG_CLANG_VERSION=180000
Expand Down Expand Up @@ -5225,6 +5225,7 @@ CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_MC13783_ADC=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_FTSTEUTATES=m
# CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_G760A=m
Expand Down Expand Up @@ -5334,6 +5335,7 @@ CONFIG_SENSORS_LT7182S=m
CONFIG_SENSORS_LTC2978=m
# CONFIG_SENSORS_LTC2978_REGULATOR is not set
CONFIG_SENSORS_LTC3815=m
# CONFIG_SENSORS_LTC4286 is not set
CONFIG_SENSORS_MAX15301=m
CONFIG_SENSORS_MAX16064=m
CONFIG_SENSORS_MAX16601=m
Expand Down Expand Up @@ -9118,6 +9120,7 @@ CONFIG_AMD_PMF=m
# CONFIG_AMD_PMF_DEBUG is not set
CONFIG_AMD_PMC=m
CONFIG_AMD_HSMP=m
# CONFIG_AMD_WBRF is not set
CONFIG_ADV_SWBUTTON=m
CONFIG_APPLE_GMUX=m
CONFIG_ASUS_LAPTOP=m
Expand Down

0 comments on commit c8a1789

Please sign in to comment.