-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #649 from nathanchance/update-patches-nov-2-2023
Update mainline and stable patches (November 2, 2023)
- Loading branch information
Showing
23 changed files
with
469 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
patches/mainline/1dc05a274a7b13fd61b6c43f0136153752e6f731.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From 1dc05a274a7b13fd61b6c43f0136153752e6f731 Mon Sep 17 00:00:00 2001 | ||
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> | ||
| Date: Wed, 20 Sep 2023 18:38:19 +0300 | ||
| Subject: device property: Replace custom implementation of COUNT_ARGS() | ||
|
|
||
| Replace custom and non-portable implementation of COUNT_ARGS(). | ||
|
|
||
| Fixes: e64b674bc9d7 ("software node: implement reference properties") | ||
| Reported-by: Nick Desaulniers <ndesaulniers@google.com> | ||
| Closes: https://lore.kernel.org/r/ZQoILN6QCjzosCOs@google.com | ||
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> | ||
| Reviewed-by: Takashi Iwai <tiwai@suse.de> | ||
| Closes: https://github.com/ClangBuiltLinux/linux/issues/1935 | ||
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> | ||
| Link: https://lore.kernel.org/r/20230920153819.2069869-1-andriy.shevchenko@linux.intel.com | ||
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
| --- | ||
| Link: https://git.kernel.org/gregkh/driver-core/c/1dc05a274a7b13fd61b6c43f0136153752e6f731 | ||
| --- | ||
| include/linux/property.h | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/include/linux/property.h b/include/linux/property.h | ||
| index 8c3c6685a2ae3..9f2585d705a86 100644 | ||
| --- a/include/linux/property.h | ||
| +++ b/include/linux/property.h | ||
| @@ -10,6 +10,7 @@ | ||
| #ifndef _LINUX_PROPERTY_H_ | ||
| #define _LINUX_PROPERTY_H_ | ||
|
|
||
| +#include <linux/args.h> | ||
| #include <linux/bits.h> | ||
| #include <linux/fwnode.h> | ||
| #include <linux/stddef.h> | ||
| @@ -288,7 +289,7 @@ struct software_node_ref_args { | ||
| #define SOFTWARE_NODE_REFERENCE(_ref_, ...) \ | ||
| (const struct software_node_ref_args) { \ | ||
| .node = _ref_, \ | ||
| - .nargs = ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \ | ||
| + .nargs = COUNT_ARGS(__VA_ARGS__), \ | ||
| .args = { __VA_ARGS__ }, \ | ||
| } | ||
|
|
||
| -- | ||
| cgit | ||
|
|
47 changes: 47 additions & 0 deletions
47
patches/mainline/cba4590036855f4e3110d43c14385d2401080dbb.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| From cba4590036855f4e3110d43c14385d2401080dbb Mon Sep 17 00:00:00 2001 | ||
| From: Nathan Chancellor <nathan@kernel.org> | ||
| Date: Fri, 27 Oct 2023 09:54:25 -0700 | ||
| Subject: ASoC: codecs: aw88399: Fix -Wuninitialized in aw_dev_set_vcalb() | ||
|
|
||
| Clang warns (or errors with CONFIG_WERROR=y): | ||
|
|
||
| sound/soc/codecs/aw88399.c:441:18: error: variable 'vsense_select' is uninitialized when used here [-Werror,-Wuninitialized] | ||
| 441 | vsense_select = vsense_select & (~AW88399_VDSEL_MASK); | ||
| | ^~~~~~~~~~~~~ | ||
| sound/soc/codecs/aw88399.c:431:28: note: initialize the variable 'vsense_select' to silence this warning | ||
| 431 | unsigned int vsense_select, vsense_value; | ||
| | ^ | ||
| | = 0 | ||
| 1 error generated. | ||
|
|
||
| This clearly should have been using the value received from | ||
| regmap_read(). Use the correct variable to resolve the warning. | ||
|
|
||
| Closes: https://github.com/ClangBuiltLinux/linux/issues/1952 | ||
| Fixes: 8ade6cc7e261 ("ASoC: codecs: Add aw88399 amplifier driver") | ||
| Signed-off-by: Nathan Chancellor <nathan@kernel.org> | ||
| Reviewed-by: Weidong Wang <wangweidong.a@awinic.com> | ||
| Link: https://lore.kernel.org/r/20231027-asoc-aw88399-fix-wuninitialized-v1-1-b1044493e4cd@kernel.org | ||
| Signed-off-by: Mark Brown <broonie@kernel.org> | ||
| --- | ||
| Link: https://git.kernel.org/broonie/sound/c/cba4590036855f4e3110d43c14385d2401080dbb | ||
| --- | ||
| sound/soc/codecs/aw88399.c | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/sound/soc/codecs/aw88399.c b/sound/soc/codecs/aw88399.c | ||
| index ce30bc7cdea9f..47fe38d0def5d 100644 | ||
| --- a/sound/soc/codecs/aw88399.c | ||
| +++ b/sound/soc/codecs/aw88399.c | ||
| @@ -438,7 +438,7 @@ static int aw_dev_set_vcalb(struct aw88399 *aw88399) | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| - vsense_select = vsense_select & (~AW88399_VDSEL_MASK); | ||
| + vsense_select = vsense_value & (~AW88399_VDSEL_MASK); | ||
|
|
||
| ret = aw88399_dev_get_icalk(aw88399, &icalk); | ||
| if (ret) { | ||
| -- | ||
| cgit | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| 1dc05a274a7b13fd61b6c43f0136153752e6f731.patch | ||
| 20231031_nathan_tcp_fix_wc23_extensions_in_tcp_options_write.patch | ||
| cba4590036855f4e3110d43c14385d2401080dbb.patch | ||
| v2_20231102_nathan_drm_amd_display_increase_frame_warning_limit_with_kasan_or_kcsan_in_dml2.patch | ||
| v2_20231102_nathan_loongarch_mark___percpu_functions_as_always_inline.patch |
Oops, something went wrong.