6.4-stable patches

added patches:
	asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
	netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
	tiocsti-document-cap_sys_admin-behaviour-in-kconfig.patch

diff --git a/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch b/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
new file mode 100644 (file)
index 0000000..3479cac
--- /dev/null
+++ b/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
@@ -0,0 +1,34 @@
+From fd0a7ec379dbf21b7bfd81914381ae5281706ef5 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 5 Jun 2023 10:58:29 +0200
+Subject: ASoC: amd: vangogh: select CONFIG_SND_AMD_ACP_CONFIG
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit fd0a7ec379dbf21b7bfd81914381ae5281706ef5 upstream.
+
+The vangogh driver just gained a link time dependency that now causes
+randconfig builds to fail:
+
+x86_64-linux-ld: sound/soc/amd/vangogh/pci-acp5x.o: in function `snd_acp5x_probe':
+pci-acp5x.c:(.text+0xbb): undefined reference to `snd_amd_acp_find_config'
+
+Fixes: e89f45edb747e ("ASoC: amd: vangogh: Add check for acp config flags in vangogh platform")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Link: https://lore.kernel.org/r/20230605085839.2157268-1-arnd@kernel.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/amd/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/soc/amd/Kconfig
++++ b/sound/soc/amd/Kconfig
+@@ -71,6 +71,7 @@ config SND_SOC_AMD_RENOIR_MACH
+ config SND_SOC_AMD_ACP5x
+       tristate "AMD Audio Coprocessor-v5.x I2S support"
+       depends on X86 && PCI
++      select SND_AMD_ACP_CONFIG
+       help
+        This option enables ACP v5.x support on AMD platform
+ 

diff --git a/queue-6.4/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch b/queue-6.4/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
new file mode 100644 (file)
index 0000000..882ca7f
--- /dev/null
+++ b/queue-6.4/netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch
@@ -0,0 +1,47 @@
+From 08713cb006b6f07434f276c5ee214fb20c7fd965 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Thu, 10 Aug 2023 23:59:03 +0200
+Subject: netfilter: nf_tables: fix kdoc warnings after gc rework
+
+From: Florian Westphal <fw@strlen.de>
+
+commit 08713cb006b6f07434f276c5ee214fb20c7fd965 upstream.
+
+Jakub Kicinski says:
+  We've got some new kdoc warnings here:
+  net/netfilter/nft_set_pipapo.c:1557: warning: Function parameter or member '_set' not described in 'pipapo_gc'
+  net/netfilter/nft_set_pipapo.c:1557: warning: Excess function parameter 'set' description in 'pipapo_gc'
+  include/net/netfilter/nf_tables.h:577: warning: Function parameter or member 'dead' not described in 'nft_set'
+
+Fixes: 5f68718b34a5 ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
+Fixes: f6c383b8c31a ("netfilter: nf_tables: adapt set backend to use GC transaction API")
+Reported-by: Jakub Kicinski <kuba@kernel.org>
+Closes: https://lore.kernel.org/netdev/20230810104638.746e46f1@kernel.org/
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/net/netfilter/nf_tables.h |    1 +
+ net/netfilter/nft_set_pipapo.c    |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/net/netfilter/nf_tables.h
++++ b/include/net/netfilter/nf_tables.h
+@@ -534,6 +534,7 @@ struct nft_set_elem_expr {
+  *    @expr: stateful expression
+  *    @ops: set ops
+  *    @flags: set flags
++ *    @dead: set will be freed, never cleared
+  *    @genmask: generation mask
+  *    @klen: key length
+  *    @dlen: data length
+--- a/net/netfilter/nft_set_pipapo.c
++++ b/net/netfilter/nft_set_pipapo.c
+@@ -1550,7 +1550,7 @@ static void nft_pipapo_gc_deactivate(str
+ 
+ /**
+  * pipapo_gc() - Drop expired entries from set, destroy start and end elements
+- * @set:      nftables API set representation
++ * @_set:     nftables API set representation
+  * @m:                Matching data
+  */
+ static void pipapo_gc(const struct nft_set *_set, struct nft_pipapo_match *m)

diff --git a/queue-6.4/series b/queue-6.4/series
index af4a49a14ce976ea3f8c789b06656d8b7948b975..b2973647bbfa9618919269c326ff02f4664220e6 100644 (file)
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -124,3 +124,6 @@ gpio-sim-dispose-of-irq-mappings-before-destroying-t.patch
 gpio-sim-pass-the-gpio-device-s-software-node-to-irq.patch
 asoc-amd-yc-fix-a-non-functional-mic-on-lenovo-82sj.patch
 maple_tree-disable-mas_wr_append-when-other-readers-.patch
+asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
+tiocsti-document-cap_sys_admin-behaviour-in-kconfig.patch
+netfilter-nf_tables-fix-kdoc-warnings-after-gc-rework.patch

diff --git a/queue-6.4/tiocsti-document-cap_sys_admin-behaviour-in-kconfig.patch b/queue-6.4/tiocsti-document-cap_sys_admin-behaviour-in-kconfig.patch
new file mode 100644 (file)
index 0000000..e3d7303
--- /dev/null
+++ b/queue-6.4/tiocsti-document-cap_sys_admin-behaviour-in-kconfig.patch
@@ -0,0 +1,36 @@
+From 3f29d9ee323ae5cda59d144d1f8b0b10ea065be0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Noack?= <gnoack3000@gmail.com>
+Date: Tue, 8 Aug 2023 22:11:12 +0200
+Subject: TIOCSTI: Document CAP_SYS_ADMIN behaviour in Kconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Günther Noack <gnoack3000@gmail.com>
+
+commit 3f29d9ee323ae5cda59d144d1f8b0b10ea065be0 upstream.
+
+Clarifies that the LEGACY_TIOCSTI setting is safe to turn off even
+when running BRLTTY, as it was introduced in commit 690c8b804ad2
+("TIOCSTI: always enable for CAP_SYS_ADMIN").
+
+Signed-off-by: Günther Noack <gnoack3000@gmail.com>
+Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Link: https://lore.kernel.org/r/20230808201115.23993-1-gnoack3000@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/Kconfig |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/tty/Kconfig
++++ b/drivers/tty/Kconfig
+@@ -164,6 +164,9 @@ config LEGACY_TIOCSTI
+         userspace depends on this functionality to continue operating
+         normally.
+ 
++        Processes which run with CAP_SYS_ADMIN, such as BRLTTY, can
++        use TIOCSTI even when this is set to N.
++
+         This functionality can be changed at runtime with the
+         dev.tty.legacy_tiocsti sysctl. This configuration option sets
+         the default value of the sysctl.