Browse Source

kernel: bump 5.15 to 5.15.89

Removed upstreamed:
  ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch[1]

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.89&id=d4fa65960a9d0cb87a1102d47145675ceed7a4e6

All other patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod

Signed-off-by: John Audia <[email protected]>
John Audia 2 years ago
parent
commit
6a3816efb7

+ 2 - 2
include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .88
-LINUX_KERNEL_HASH-5.15.88 = 417539fdd96a3af97ef9ad2b51ca13967cb922f53970563b60290b935a81a181
+LINUX_VERSION-5.15 = .89
+LINUX_KERNEL_HASH-5.15.89 = e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8

+ 1 - 1
target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch

@@ -329,7 +329,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
  	/* forking complete and child started to run, tell ptracer */
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4978,6 +4978,7 @@ context_switch(struct rq *rq, struct tas
+@@ -5007,6 +5007,7 @@ context_switch(struct rq *rq, struct tas
  		 * finish_task_switch()'s mmdrop().
  		 */
  		switch_mm_irqs_off(prev->active_mm, next->mm, next);

+ 1 - 1
target/linux/generic/hack-5.15/904-debloat_dma_buf.patch

@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4213,6 +4213,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

+ 0 - 42
target/linux/ipq806x/patches-5.15/007-v6.3-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch

@@ -1,42 +0,0 @@
-From: Brian Norris <[email protected]>
-Date: Thu, 15 Dec 2022 01:33:45 -0800
-Subject: [PATCH] ASoC: qcom: lpass-cpu: Fix fallback SD line index handling
-
-[[ Submitted upstream as:
-   https://lore.kernel.org/all/[email protected]/
-   Currently queued for -next (v6.3?) as:
-   000bca8d706d ASoC: qcom: lpass-cpu: Fix fallback SD line index handling
-]]
-
-These indices should reference the ID placed within the dai_driver
-array, not the indices of the array itself.
-
-This fixes commit 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD
-lines configurable"), which among others, broke IPQ8064 audio
-(sound/soc/qcom/lpass-ipq806x.c) because it uses ID 4 but we'd stop
-initializing the mi2s_playback_sd_mode and mi2s_capture_sd_mode arrays
-at ID 0.
-
-Fixes: 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD lines configurable")
-Cc: <[email protected]>
-Signed-off-by: Brian Norris <[email protected]>
----
- sound/soc/qcom/lpass-cpu.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/sound/soc/qcom/lpass-cpu.c
-+++ b/sound/soc/qcom/lpass-cpu.c
-@@ -851,10 +851,11 @@ static void of_lpass_cpu_parse_dai_data(
- 					struct lpass_data *data)
- {
- 	struct device_node *node;
--	int ret, id;
-+	int ret, i, id;
- 
- 	/* Allow all channels by default for backwards compatibility */
--	for (id = 0; id < data->variant->num_dai; id++) {
-+	for (i = 0; i < data->variant->num_dai; i++) {
-+		id = data->variant->dai_driver[i].id;
- 		data->mi2s_playback_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH;
- 		data->mi2s_capture_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH;
- 	}