[linux-yocto] Trial merge of v5.15.154 v5.15.155 v6.1.85 v6.1.86 v6.6.26 v6.6.27 for linux-yocto
Hi Bruce,
This is a trial merge of the stable kernel v5.15.154 v5.15.155 v6.1.85 v6.1.86
v6.6.26 v6.6.27 for the following branches in the linux-yocto.
e9abb220b483 v5.15/standard/sdkv5.10/axxia
45ea7fd6deb3 v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
338e45bb3c72 v5.15/standard/base
560114e1157c v5.15/standard/preempt-rt/base
#Have textual conflicts
15bfd383b4fe v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
fe537f5c00aa v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
42d51dfcf742 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
a360a277d8c5 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
94f8d18051bc v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have semantic conflicts
28a567a954bb v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual and semantic conflicts
9b10d67f9133 v5.15/standard/nxp-sdk-5.15/nxp-soc
000ea032ce7e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
7275aca4cfdf v5.15/standard/bcm-2xxx-rpi
#Have textual conflicts
78c69a0f908a v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
6787a55d698c v5.15/standard/nxp-sdk-5.15/nxp-s32g
93d7d914ca7f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
637311038753 v5.15/standard/intel-sdk-5.15/intel-socfpga
a06b22b7d58e v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
4d50b8c5189a v5.15/standard/x86
276dfc4331d5 v5.15/standard/preempt-rt/x86
#Have textual conflicts
98a0d48f8b36 v5.15/standard/sdkv5.15/xlnx-soc
7792c8cb904e v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
9ceb112cb342 v6.1/standard/sdkv5.10/axxia
7cf4993427e1 v6.1/standard/preempt-rt/sdkv5.10/axxia
4dabed7fb978 v6.1/standard/base
9e90f437b653 v6.1/standard/preempt-rt/base
5a46b2f8deb1 v6.1/standard/ti-sdk-6.1/ti-j7xxx
9a28a49e61f2 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
470cf58c8b0a v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
1a3c9deae571 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
e5e11cf46c8b v6.1/standard/cn-sdkv5.15/octeon
6f429f01fa65 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
db049b49dff8 v6.1/standard/cn-sdkv6.1/octeon
cc34d22ea6ec v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
a3d86213ad68 v6.1/standard/microchip-polarfire-soc
3ceee345c596 v6.1/standard/preempt-rt/microchip-polarfire-soc
2251f3484861 v6.1/standard/bcm-2xxx-rpi
1d41d5af914d v6.1/standard/preempt-rt/bcm-2xxx-rpi
25c63255a081 v6.1/standard/nxp-sdk-5.15/nxp-s32g
806851c530cf v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
912f6a8d9b46 v6.1/standard/intel-sdk-6.1/intel-socfpga
80ad7c379462 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
aa513c5e1706 v6.1/standard/x86
61d456afb1a9 v6.1/standard/preempt-rt/x86
4219fee1b3b0 v6.1/standard/sdkv6.1/xlnx-soc
f28253069109 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
94cc25c90d4b v6.6/standard/base
66e58fb721a8 v6.6/standard/preempt-rt/base
#Have textual conflicts
8c366355c6f8 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
4c8afd018000 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
Most of the merge conflicts come from v5.15 kernel.
- There is a merge conflict on the v5.15 rt kernel. It is caused by
stable commit 9bd2f11ac9ef ("printk: Update @console_may_schedule in
console_trylock_spinning()")
rt commit 2d440f3f2ee5 ("printk: move console printing to kthreads")
We just need to drop the changes introduced by stable commit 9bd2f11ac9ef
because the original
console_trylock_spinning() function was already delete by rt commit
2d440f3f2ee5.
- There is a semantic conflict on v5.15 j72xx branches. We need to drop the
umin() function
in drivers/media/platform/vxe-vxd/decoder/h264_secure_parser.c because an
umin() macro
was introduce by stable commit cf716d5a0dd8 ("minmax: add umin(a, b) and
umax(a, b)")
- There is also a semantic conflict on v6.6 nxp branches. We need adjust the
change of
stable commit e1e4a5cbb0a1 ("ASoC: fsl_sai: Fix no frame sync clock issue on
i.MX8MP")
based on the changes introduced by sdk commit ce4d3e93d18f ("ASoC: fsl_sai:
add fsl,txm-rxs
property support")
- There are two merge conflicts on the v6.6 rt kernels. One is pretty trivial
and is caused by:
rt commit f8959fec5f38
[linux-yocto][v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g][PATCH] dts: Aptiv-FL: Update 'Slew-Rates' from MSCR registers
From: Quanyang Wang
In SDK commit 3bf1e1fe0321 ("s32cc: Update 'Slew-Rates' from MSCR
registers", "Slew-Rates" is updated.
Signed-off-by: Quanyang Wang
---
Hi Bruce,
Would you please help merge this patch to the branches:
v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
v6.1/standard/nxp-sdk-5.15/nxp-s32g
Thanks,
Quanyang
---
.../boot/dts/freescale/s32gxxxa-cvc-fl.dtsi | 86 +--
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/s32gxxxa-cvc-fl.dtsi
b/arch/arm64/boot/dts/freescale/s32gxxxa-cvc-fl.dtsi
index 537eda907e80d..9ca0424e49fdb 100644
--- a/arch/arm64/boot/dts/freescale/s32gxxxa-cvc-fl.dtsi
+++ b/arch/arm64/boot/dts/freescale/s32gxxxa-cvc-fl.dtsi
@@ -255,13 +255,13 @@ can0_pins: can0 {
can0_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
can0_grp1 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
can0_grp2 {
@@ -273,13 +273,13 @@ can1_pins: can1 {
can1_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
can1_grp1 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
can1_grp2 {
@@ -292,13 +292,13 @@ can2_pins: can2 {
can2_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
can2_grp1 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
can2_grp2 {
@@ -311,13 +311,13 @@ can3_pins: can3 {
can3_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
can3_grp1 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
can3_grp2 {
@@ -330,26 +330,26 @@ dspi1_pins: dspi1 {
dspi1_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
bias-pull-up;
};
dspi1_grp1 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
dspi1_grp2 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
dspi1_grp3 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
bias-pull-up;
};
@@ -363,13 +363,13 @@ dspi1slave_pins: dspi1slave {
dspi1slave_grp0 {
pinmux = ;
output-enable;
- slew-rate = ;
+ slew-rate = ;
};
dspi1slave_grp1 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
dspi1slave_grp2 {
@@ -381,13 +381,13 @@ dspi1slave_grp2 {
dspi1slave_grp3 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
dspi1slave_grp4 {
pinmux = ;
input-enable;
- slew-rate = ;
+ slew-rate = ;
bias-pull-up;
};
@@ -400,7 +400,7 @@ i2c0_grp0 {
drive-open-drain;
output-enable;
input-enable;
- slew-rate = ;
+ slew-rate = ;
};
i2c0_grp1 {
@@ -416,7 +416,7 @@ i2c0_gpio_grp0 {
;
drive-open-drain;
output-enable;
- slew-rate = ;
+ slew-r
