- 6.1.20

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 069939788385325eace2cac7bf3492c36f4c9773..74155ef9fcc2e6ffb6a8a1dae41fdef13583729b 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -15091,6 +15091,7 @@ SND_HDA_GENERIC all=m
 #- Set to Y if you want auto-loading the codec driver
 SND_HDA_POWER_SAVE_DEFAULT all=300
 SND_HDA_INTEL_HDMI_SILENT_STREAM all=y
+SND_HDA_CTL_DEV_ID all=n
 
 #-
 #- *** FILE: sound/pcmcia/Kconfig ***

diff --git a/kernel.spec b/kernel.spec
index 7d73dddd26328c45b7fc2ed343bcb3e9214718b0..bdda35f107e7901c416597aa91e90e7f7c6ebc89 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         6.1
-%define                postver         .14
+%define                postver         .20
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5: 475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:  4c7f8f14ab65b6f98610d2484f620efe
+# Patch0-md5:  159b79ed2adb681ca40d85ea4bebe904
 %endif
 Source1:       kernel.sysconfig
 
@@ -151,7 +151,6 @@ Source55:   kernel-imq.config
 
 Source58:      kernel-inittmpfs.config
 
-Patch1:                make-4.4.patch
 Patch2:                android-enable-building-binder-as-module.patch
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
 Patch3:                kernel-fbcondecor.patch
@@ -610,7 +609,6 @@ cd linux-%{basever}
 %endif
 
 %if %{without vanilla}
-%patch1 -p1
 %patch2 -p1
 
 %if %{with fbcondecor}

diff --git a/make-4.4.patch b/make-4.4.patch
deleted file mode 100644 (file)
index 46ae0e3..0000000
--- a/make-4.4.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 22c65447a7a4667b91ce82a027c91005df136768 Mon Sep 17 00:00:00 2001
-From: Dmitry Goncharov <dgoncharov@users.sf.net>
-Date: Mon, 5 Dec 2022 16:48:19 -0500
-Subject: kbuild: Port silent mode detection to future gnu make.
-
-Port silent mode detection to the future (post make-4.4) versions of gnu make.
-
-Makefile contains the following piece of make code to detect if option -s is
-specified on the command line.
-
-ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
-
-This code is executed by make at parse time and assumes that MAKEFLAGS
-does not contain command line variable definitions.
-Currently if the user defines a=s on the command line, then at build only
-time MAKEFLAGS contains " -- a=s".
-However, starting with commit dc2d963989b96161472b2cd38cef5d1f4851ea34
-MAKEFLAGS contains command line definitions at both parse time and
-build time.
-
-This '-s' detection code then confuses a command line variable
-definition which contains letter 's' with option -s.
-
-$ # old make
-$ make net/wireless/ocb.o a=s
-  CALL    scripts/checksyscalls.sh
-  DESCEND objtool
-$ # this a new make which defines makeflags at parse time
-$ ~/src/gmake/make/l64/make net/wireless/ocb.o a=s
-$
-
-We can see here that the letter 's' from 'a=s' was confused with -s.
-
-This patch checks for presence of -s using a method recommended by the
-make manual here
-https://www.gnu.org/software/make/manual/make.html#Testing-Flags.
-
-Link: https://lists.gnu.org/archive/html/bug-make/2022-11/msg00190.html
-Reported-by: Jan Palus <jpalus+gnu@fastmail.com>
-Signed-off-by: Dmitry Goncharov <dgoncharov@users.sf.net>
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
----
- Makefile | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 797fafbc1b45c..53fa1a9fba8aa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -93,10 +93,17 @@ endif
- 
- # If the user is running make -s (silent mode), suppress echoing of
- # commands
-+# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.
- 
--ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
--  quiet=silent_
--  KBUILD_VERBOSE = 0
-+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
-+silence:=$(findstring s,$(firstword -$(MAKEFLAGS)))
-+else
-+silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS)))
-+endif
-+
-+ifeq ($(silence),s)
-+quiet=silent_
-+KBUILD_VERBOSE = 0
- endif
- 
- export quiet Q KBUILD_VERBOSE
--- 
-cgit 
-