Hi Bruce,
This is a trial merge of the stable kernel v6.1.103 v6.6.44 for the following
branches in the linux-yocto.
109b5922f3c2 v6.1/standard/sdkv5.10/axxia
6eb30505e1fe v6.1/standard/preempt-rt/sdkv5.10/axxia
0b9f39c92954 v6.1/standard/base
d640b5fe21f9
Hi Bruce,
This is a trial merge of the stable kernel v5.15.163 v6.1.100 v6.1.101 v6.6.41
v6.6.42 for the following branches in the linux-yocto.
827938d7ff39 v5.15/standard/sdkv5.10/axxia
634d12e3ad6b v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
Hi Bruce,
This is a trial merge of the stable kernel v5.15.163 v6.1.100 v6.6.41 for the
following branches in the linux-yocto.
827938d7ff39 v5.15/standard/sdkv5.10/axxia
634d12e3ad6b v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
cfa0c0489f14
Hi Bruce,
This is a trial merge of the stable kernel v6.1.98 v6.6.39 for the following
branches in the linux-yocto.
5ef56ebcd304 v6.1/standard/sdkv5.10/axxia
daa8e73c826f v6.1/standard/preempt-rt/sdkv5.10/axxia
b9d6d0cbf23e v6.1/standard/base
89fe8e824074
Hi Bruce,
This is a trial merge of the stable kernel v5.15.162 v6.1.97 v6.6.37 for the
following branches in the linux-yocto.
bc2be28652bc v5.15/standard/sdkv5.10/axxia
f575959af23a v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
3792cd58
From: Kevin Hao
The SDK commit 37c4a44aefd2 ("octeontx-83: domain based driver for
83xx") introduced an unused mutex. Drop it to fix the build warning.
Signed-off-by: Kevin Hao
---
drivers/net/ethernet/cavium/octeontx-83xx/fpavf_main.c | 1 -
1 file changed, 1 deletion(-)
From: Kevin Hao
A new CS_MODE_READ_PREVBOOT mode was introduced by commit e86129e38029
("coresight: tmc: etr: Add support for Marvell OcteonTX2"), but it was
not added in switch of etm4_disable(). This would emit a build error
like below when CONFIG_WERROR is enabled:
drivers
From: Kevin Hao
After the commit c4f135d643823a86 ("workqueue: Wrap flush_workqueue()
using a macro"), a compile warning would be emitted for invocation of
flush_scheduled_work() in order to avoid the usage of this function
anymore. It really makes no sense to flush system_wq in oct
Hi Bruce,
This patch series fix several build errors when CONFIG_WERROR is enabled
on v6.6 octeon branches. Please help me merge these patches into following
two branches:
v6.6/standard/cn-sdkv6.1/octeon
v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
---
Kevin Hao (3):
net: octeontx-83xx
Hi Bruce,
This is a trial merge of the stable kernel v6.1.95 v6.6.35 for the following
branches in the linux-yocto.
05be897e7591 v6.1/standard/sdkv5.10/axxia
3eac668859b8 v6.1/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
dc9370074861
From: Kevin Hao
This unused lock was introduced by commit 4066b40be0b7 ("OF: DT-Overlay
configfs interface (v8)"). Delete it to fix the build warning.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.6/standard/sdkv6.6/xlnx-
Hi Bruce,
This is a trial merge of the stable kernel v6.1.93 v6.6.33 for the following
branches in the linux-yocto.
beff341412bb v6.1/standard/sdkv5.10/axxia
adf6a319a08c v6.1/standard/preempt-rt/sdkv5.10/axxia
3803209e1cd9 v6.1/standard/base
2dad312fdbf5
From: Kevin Hao
It seems that the changes introduced by following SDK commits on rpi
branch sneak into s32g branch via merge 7dc7e308a5a8 ("Merge branch
'v6.1/standard/base' into v6.1/standard/nxp-sdk-5.15/nxp-s32g").
7cd65778c0c1 ("bcmgenet: Better coalescing par
Hi Bruce,
This is a trial merge of the stable kernel v5.15.159 v5.15.160 v6.1.91 v6.1.92
v6.6.31 v6.6.32 for the following branches in the linux-yocto.
71048115f6bc v5.15/standard/sdkv5.10/axxia
72de38604da8 v5.15/standard/preempt-rt/sdkv5.10/axxia
95258d7b1cd7 v5.15/standard/base
Hi Bruce,
This is a trial merge of the stable kernel v5.15.159 v6.1.91 v6.6.31 for the
following branches in the linux-yocto.
4556d2fec7b4 v5.15/standard/sdkv5.10/axxia
46fe25727bd4 v5.15/standard/preempt-rt/sdkv5.10/axxia
51f4984490ae v5.15/standard/base
c20bf83420cf
From: Kevin Hao
These two functions were introduced by SDK commit ea89facb789f
("thermal: Add generic device cooling support") and used by several
imx and qoriq thermal drivers. But its name conflict with the functions
in the devfreq_cooling.c. So rename them to fix the build errors.
From: Kevin Hao
The pm_system_irq_wakeup() is called in drivers/mailbox/imx-mailbox.c.
If we don't export it, compiling imx-mailbox as a module would fail.
Fixes: 4f494c86d83f ("MLK-25649-4 mailbox: imx: Add support for identifying SCU
wakeup source from sysfs")
Signed-off-by:
From: Kevin Hao
The fsl_edma_get_realcnt() is called in drivers/dma/fsl-edma.c. If we
don't export it, compiling fsl-edma as a module would fail.
Fixed: 276ac35c4517 ("dmaengine: fsl-edma: calculate the real count for slave
sg")
Signed-off-by: Kevin Hao
---
drivers/dma/fsl-edma-co
From: Kevin Hao
The audio_pdev has been moved from struct cdn_dp_device to
struct cdns_mhdp_device by SDK commit 33c5a61621c2 ("drm: bridge:
mhdp: Add cdns mhdp driver bridge driver"), fix a missed incorrect
reference to it.
Signed-off-by: Kevin Hao
---
drivers/gpu/drm/rockchip/cdn
From: Kevin Hao
Shuffle the location of '#include "fsl_easrc_m2m.c"' upwards to fix the
following build error:
sound/soc/fsl/fsl_easrc.c: In function 'fsl_easrc_hw_params':
sound/soc/fsl/fsl_easrc.c:1511:15: error: implicit declaration of function
'fsl_easrc_m2m_init' [-Werror=implici
From: Kevin Hao
- When porting SDK patches, the imx8mm-evk-root.dtb is deleted by the
commit 35e4c9ea1ae8 ("LF-4887-15 arm64: dts: imx8mm-ddr4-evk-revb:
Add RAYDIUM RM67191 command RAM display operation mode support"), but
it is still referenced in the Makefile.
- The
From: Kevin Hao
In commit cd2b02d919b2 ("LF-1232-12 arm64: dts: imx8qxp-mek: Add DPU
LCDIF support with rpmsg"), a 'i' was missed in the dtb name.
Signed-off-by: Kevin Hao
---
arch/arm64/boot/dts/freescale/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/
From: Kevin Hao
The imx8qxp.dtsi has been mistakenly deleted by SDK commit 131ad0f151c0
("LF-2361-2 arm64: dts: Add new DTS imx8x-mek for MEK common nodes") and
then trigger build errors. Fixes them by restoring it back.
Signed-off-by: Kevin Hao
---
arch/arm64/boot/dts/freesca
Hi Bruce,
This patch series fixes misc build failures when enabling different
kernel option combos. Please help me merge them into the following two
branches:
v6.1/standard/nxp-sdk-6.1/nxp-soc
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
---
Kevin Hao (8):
arm64: dts: Restore
On Tue, May 07, 2024 at 03:45:05PM -0400, Bruce Ashfield via
lists.yoctoproject.org wrote:
> Make sure you are following the configuration advice here:
>
> https://docs.yoctoproject.org/contributor-guide/submit-changes.html#fixing-your-from-identity
>
> And if the issue persists, we'll have to
Hi Bruce,
This is a trial merge of the stable kernel v5.15.158 v6.1.90 v6.6.30 for the
following branches in the linux-yocto.
20f06c631ff4 v5.15/standard/sdkv5.10/axxia
d244180a190c v5.15/standard/preempt-rt/sdkv5.10/axxia
92abce38992e v5.15/standard/base
bcd78f60b44c
From: Kevin Hao
The rt commit 3e8aef19aa6f ("serial: core: Use port lock wrappers") has
changed to use the port lock wrappers in function
serial_port_runtime_resume(). But that was mangled when merging v6.6.29.
Restore it back.
Signed-off-by: Kevin Hao
---
drivers/tty/serial/serial_
From: Kevin Hao
Hi Bruce,
Please help me merge them onto the following two rt branches:
v6.6/standard/preempt-rt/base
v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
Kevin Hao (2):
drm/i915: Drop some unrelated changes introduced during the merge of
v6.6.29
serial: core: Use port lock
From: Kevin Hao
There are no these changes in the v6.6.29.
Signed-off-by: Kevin Hao
---
drivers/gpu/drm/i915/display/intel_crtc.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c
b/drivers/gpu/drm/i915/display/intel_crtc.c
From: Kevin Hao
There is only one simple commit 831157756e3c ("net: ethernet: ti:
am65-cpsw-nuss: cleanup DMA Channels before using them") which touched
drivers/net/ethernet/ti/am65-cpsw-nuss.c between v5.15.156 and
v5.15.157. But when merging of v5.15.157, some unrelated chang
Hi Bruce,
This is a trial merge of the stable kernel v5.15.157 v6.1.88 v6.6.29 for the
following branches in the linux-yocto.
c77673e7423a v5.15/standard/sdkv5.10/axxia
99cb138a69a5 v5.15/standard/preempt-rt/sdkv5.10/axxia
d39c8ca540cb v5.15/standard/base
49d3fa750e2a
From: Kevin Hao
When merging b140d9d4515f ("drm/bridge: adv7511: fix crash on irq during
probe") into nxp branches, it conflicts with the SDK commit ad93dd09fbbe
("Revert "drm/bridge: adv7511: Register and attach our DSI device at
probe""). The current merge res
Hi Bruce,
This is a trial merge of the stable kernel v5.15.156 v6.1.87 v6.6.28 for the
following branches in the linux-yocto.
66b53490ea03 v5.15/standard/sdkv5.10/axxia
94a34cfd8fcb v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
396572146060
From: Kevin Hao
The struct v4l2_input::name is an array, so the checking of
(mxc_capture_inputs[cam->current_input].name != NULL) always return
true. The issue was introduced by commit 5b1aeb69cf15 ("media: capture:
add mxc v4l2 capture driver").
Signed-off-by: Kevin Hao
---
Hi B
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
Hi Bruce,
This is a trial merge of the stable kernel v5.15.154 v6.1.85 v6.6.26 for the
following branches in the linux-yocto.
5925e69a8f2a v5.15/standard/sdkv5.10/axxia
5bf35db75320 v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
f1612b786de6
From: Kevin Hao
This unused label was introduced by sdk commit 6f13f0d7b7a7 ("net/can:
llce: Add self-recv devlink parameter").
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-5.15/nxp-s32g
v6.1/standard/
From: Kevin Hao
This was introduced by sdk commit 79a372458bdf ("vxe-vxd: encoder: Fix
memory leak in vxe encoder driver").
Signed-off-by: Kevin Hao
---
drivers/media/platform/vxe-vxd/encoder/topaz_api.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dri
From: Kevin Hao
These unused variable and function were introduced by following two SDK
commit:
f8e6ff41424e ("decoder: separate V4L2 node implementation from common driver")
441f9ae2b664 ("vxe-vxd: decoder: allowing vb mapping to change for buffer
importing")
Sign
From: Kevin Hao
Hi Bruce,
These two patches fix several build warnings on v5.15 j72xx branches.
Please help me merge them into the following two branches:
v5.15/standard/ti-sdk-5.10/ti-j72xx
v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
Kevin Hao (2):
media: vxe-vxd: Drop unused
From: Kevin Hao
The stable commit 8d8be62a7d53 ("minmax: add umin(a, b) and umax(a, b)")
introduced an umin() macro. This conflicts with the umin() inline
function in vxe-vxd driver. So drop this inline function to fix the
build error.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Could y
Hi Bruce,
This is a trial merge of the stable kernel v6.1.84 for the following branches
in the linux-yocto.
7e8aba41d616 v6.1/standard/sdkv5.10/axxia
20b864b63270 v6.1/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
6e7505a77dab v6.1/standard/base
duling domain into account in select_idle_smt()
sched/fair: Take the scheduling domain into account in select_idle_core()
Kevin Hao (2):
Merge branch 'v6.1/standard/base' into
v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
net: octeontx-83xx: Drop unused octeontx_fpavf_alloc_lock
Kon
into account in select_idle_smt()
sched/fair: Take the scheduling domain into account in select_idle_core()
Kevin Hao (2):
Merge branch 'v6.1/standard/base' into v6.1/standard/cn-sdkv6.1/octeon
net: octeontx-83xx: Drop unused octeontx_fpavf_alloc_lock
Konrad Dybcio (3):
clk: qcom: res
On Thu, Mar 28, 2024 at 02:43:26PM -0400, Bruce Ashfield wrote:
> I did just create add a new BSP, and it has issues:
>
> v6.1/standard/cn-sdkv6.1/octeon
> v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
>
> For now, I've excluded them from the update, so they'll need
> to be resolved and sent
Hi Bruce,
This is a trial merge of the stable kernel v5.15.153 v6.1.83 for the following
branches in the linux-yocto.
205fb9414e6e v5.15/standard/sdkv5.10/axxia
979be40c2ae5 v5.15/standard/preempt-rt/sdkv5.10/axxia
74734259970f v5.15/standard/base
bb72fca17f4f
From: Kevin Hao
This unused variable was introduced by commit 20932f1f83d3 ("fec_ecat:
add fec native driver for raw packet proto").
Signed-off-by: Kevin Hao
---
net/socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/socket.c b/net/socket.c
index 08
From: Kevin Hao
The SDK commit 20932f1f83d3 ("fec_ecat: add fec native driver for raw
packet proto") has changed the prototype of packet_do_bind(), but
forgot to delete the unused variables due to this change.
Signed-off-by: Kevin Hao
---
net/packet/af_packet.c | 2 --
1 file
From: Kevin Hao
Hi Bruce,
This patch series fixes two build warnings introduced by SDK commit
20932f1f83d3 ("fec_ecat: add fec native driver for raw packet proto").
Please help me merge them onto the following two branches:
v6.1/standard/nxp-sdk-6.1/nxp-soc
v6.1/standard/preempt-
On Wed, Mar 27, 2024 at 03:30:35PM +0800, Xulin Sun via lists.yoctoproject.org
wrote:
> Add kernel configs NET_SCH_CBS & NET_SCH_MQPRIO & NET_SCH_ETF to support
> AM62AX TSN feature.
>
> Signed-off-by: Xulin Sun
> ---
> bsp/ti-am62/ti-am62.cfg | 3 +++
> 1 file changed, 3 insertions(+)
>
>
this issue by explicitly setting the preferred_depth in this driver.
With this change, the modesetting driver would choose the correct
depth/bpp combo based on our setting in xorg.conf.
Fixes: c91acda3a380 ("drm/gem: Check for valid formats")
Cc: sta...@vger.kernel.org
Signed-off-by: Ke
Hi Bruce,
This is a trial merge of the stable kernel v5.15.152 v6.1.82 for the following
branches in the linux-yocto.
8441795c5d6f v5.15/standard/sdkv5.10/axxia
8242dc07ca33 v5.15/standard/preempt-rt/sdkv5.10/axxia
c83b73b48974 v5.15/standard/base
0d992354aa32
Hi Bruce,
This is a trial merge of the stable kernel v5.15.151 v6.1.81 for the following
branches in the linux-yocto.
ccbd1ffa2151 v5.15/standard/sdkv5.10/axxia
45a604286a8a v5.15/standard/preempt-rt/sdkv5.10/axxia
ed7ee8867f98 v5.15/standard/base
303f3510d546
On Sun, Mar 03, 2024 at 12:09:06PM -0500, Bruce Ashfield wrote:
> On the tjxx BSPs, I had a bit of a strange merge with the dtb script,
> so it may have issues.
I have rechecked all the branches, and they all seem fine. Thanks Bruce.
Thanks,
Kevin
signature.asc
Description: PGP signature
Hi Bruce,
This is a trial merge of the stable kernel v5.15.150 v6.1.80 for the following
branches in the linux-yocto.
d9a206b1e8df v5.15/standard/sdkv5.10/axxia
3bbed27ea98f v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
752c3e846500
rn ERR_PTR(-EINVAL);
So drop this duplicate code.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please merge this patch onto the following two branches:
v5.15/standard/nxp-sdk-5.15/nxp-soc
v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
drivers/clk/imx/clk-scu.c | 5 -
1 file changed, 5 deletion
Hi Bruce,
This is a trial merge of the stable kernel v5.15.149 v6.1.79 for the following
branches in the linux-yocto.
db86285e418d v5.15/standard/sdkv5.10/axxia
a5f452ad72bb v5.15/standard/preempt-rt/sdkv5.10/axxia
d5d1e68638a8 v5.15/standard/base
d1b7b9eb0c90
From: Kevin Hao
The merge commit 7104a5aa5d2a ("Merge branch 'v6.1/standard/base' into
v6.1/standard/bcm-2xxx-rpi") left some duplicated quirk table entries
when fixing merge conflicts. Remove them and also shuffle some entries
to sort them in USB ID order as what it does in sta
Hi Bruce,
This is a trial merge of the stable kernel v6.1.78 for the following branches
in the linux-yocto.
4f1a9f1d7ee4 v6.1/standard/sdkv5.10/axxia
9c240941be25 v6.1/standard/preempt-rt/sdkv5.10/axxia
284ad4cc497a v6.1/standard/base
ac08ae673eb8 v6.1/standard/preempt-rt/base
On Wed, Feb 14, 2024 at 11:17:58PM -0500, Bruce Ashfield wrote:
> My resolution scripts ended up picking up some old merge resolutions
> that weren't correct for 6.1.
>
> I've re-done the merges by hand for the conflicting branches, but
> they still don't look quite right.
No worries, all the
From: Kevin Hao
The stable commit 01946c3c83b2 ("soc: xilinx: Fix for call trace due to
the usage of smp_processor_id()") is trying to fix a call trace in the
xlnx_event_init_sgi(), but that issue has already been fixed by a local
commit 3eea40ee0991 ("driver: soc: xilinx: ren
Hi Bruce,
This is a trial merge of the stable kernel v5.15.148 v6.1.75 for the following
branches in the linux-yocto.
a512a15e82c8 v5.15/standard/sdkv5.10/axxia
ce5659a6d6ff v5.15/standard/preempt-rt/sdkv5.10/axxia
a9918c33416b v5.15/standard/base
be927f5f96e8
Hi Bruce,
This is a trial merge of the stable kernel v6.1.74 for the following branches
in the linux-yocto.
a2aca9977c0e v6.1/standard/sdkv5.10/axxia
5c2743e3ef42 v6.1/standard/preempt-rt/sdkv5.10/axxia
f7868a17cc92 v6.1/standard/base
850bc54a159f v6.1/standard/preempt-rt/base
From: Kevin Hao
These kernel options aren't assignable. In the previous version of the
kernel, these options were selected by DRM_FBDEV_EMULATION. But due to
the commit 43049f17b526 ("drm/i915: Implement dedicated fbdev I/O
helpers") in the new version of kernel, they are no long
Hi Bruce,
This is a trial merge of the stable kernel v5.15.147 v6.1.73 for the following
branches in the linux-yocto.
9a246c2e36ad v5.15/standard/sdkv5.10/axxia
c2332b69f732 v5.15/standard/preempt-rt/sdkv5.10/axxia
2e914c1570ee v5.15/standard/base
ae36cbd24fb1
Hi Bruce,
This is a trial merge of the stable kernel v5.15.146 v6.1.71 v6.1.72 for the
following branches in the linux-yocto.
b5fbbdffbd1d v5.15/standard/sdkv5.10/axxia
34c731e80124 v5.15/standard/preempt-rt/sdkv5.10/axxia
78df6de45c41 v5.15/standard/base
c003aea6270f
Hi Bruce,
This is a trial merge of the stable kernel v5.15.146 v6.1.71 for the following
branches in the linux-yocto.
b5fbbdffbd1d v5.15/standard/sdkv5.10/axxia
34c731e80124 v5.15/standard/preempt-rt/sdkv5.10/axxia
78df6de45c41 v5.15/standard/base
c003aea6270f
Hi Bruce,
This is a trial merge of the stable kernel v6.1.70 for the following branches
in the linux-yocto.
bd81c876a182 v6.1/standard/sdkv5.10/axxia
852fcab9cd9d v6.1/standard/preempt-rt/sdkv5.10/axxia
e1400265cf9c v6.1/standard/base
46ab880eedc0 v6.1/standard/preempt-rt/base
Hi Bruce,
This is a trial merge of the stable kernel v5.15.144 v6.1.69 for the following
branches in the linux-yocto.
0d0adcd42087 v5.15/standard/sdkv5.10/axxia
f338beb8fece v5.15/standard/preempt-rt/sdkv5.10/axxia
0e48cf50d3aa v5.15/standard/base
1f253ec3cc59
From: Kevin Hao
Due to the SDK changes, the stable commit 12ac3b0ab837 ("ARM: imx: Check
return value of devm_kasprintf in imx_mmdc_perf_init") doesn't apply to
the nxp branches. But part of this commit was merged mistakenly. Revert
these changes to fix the following build errors:
From: Kevin Hao
The SDK commit 3fc9d125f615 ("ASoC: fsl_sai: add fsl,txm-rxs property
support") has changed fsl_sai::is_consumer_mode to an array of bool.
But the stable commit 4a8774a63303 ("ASoC: fsl_sai: Fix no frame sync
clock issue on i.MX8MP") still use it as a bool. A
Hi Bruce,
This is a trial merge of the stable kernel v5.15.143 v6.1.68 for the following
branches in the linux-yocto.
2f940fa920cc v5.15/standard/sdkv5.10/axxia
d2a0f18129b5 v5.15/standard/preempt-rt/sdkv5.10/axxia
566595b1d042 v5.15/standard/base
662b30a31bbd
Hi Bruce,
This is a trial merge of the stable kernel v6.1.67 for the following branches
in the linux-yocto.
7228b28609ae v6.1/standard/sdkv5.10/axxia
3201b12aafbe v6.1/standard/preempt-rt/sdkv5.10/axxia
85e058f4449a v6.1/standard/base
5300f6b89f63 v6.1/standard/preempt-rt/base
Hi Bruce,
This is a trial merge of the stable kernel v5.15.142 v6.1.66 for the following
branches in the linux-yocto.
ec0a79dc0aef v5.15/standard/sdkv5.10/axxia
507bb438d059 v5.15/standard/preempt-rt/sdkv5.10/axxia
4669302184b9 v5.15/standard/base
783e573df9cf
From: Kevin Hao
Fixes build errors introduced by SDK commit 6906c3fbe592 ("net:
flow_dissector: Add IPSEC dissector"):
net/core/flow_dissector.c: In function ‘__skb_flow_dissect’:
net/core/flow_dissector.c:1449:40: error: passing argument 4 of
‘__skb_flow_dissect_esp’ discards ‘const’
From: Kevin Hao
The SDK commit a9d5338d0643 ("hwrng: bcm2835 - sleep more
intelligently") and stable commit 3c5c7f926a4b ("hwrng: bcm2835 - Fix
hwrng throughput regression") are trying to fix the same issue with
different implementation. The later approach is better. So re
From: Kevin Hao
This is a change introduced by stable commit 8025fd0706c8 ("net:
axienet: Fix check for partial TX checksum"), and it was overrode by
merge commit b7ed6a246663 ("Merge branch 'v6.1/standard/base' into
v6.1/standard/sdkv6.1/xlnx-soc"). Restore it back.
Sign
From: Kevin Hao
The otx2_hw::tot_tx_queues has been renamed to otx2_hw::non_qos_queues
by stable commit 479d344a929b ("octeontx2-pf: Rename tot_tx_queues to
non_qos_queues"), so we need adjust our codes according to this change.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Could you hel
From: Kevin Hao
This is a change introduced by stable commit 6aeac88a45de ("net:
axienet: Fix check for partial TX checksum"), and it was overrode by
merge commit 4ada1b0800dc ("Merge branch 'v5.15/standard/base' into
v5.15/standard/sdkv5.15/xlnx-soc"). Restore it back.
Sign
From: Kevin Hao
This is a change introduced by stable commit 7d416973cd12 ("clk: imx:
imx8mq: correct error handling path"), but it was overrode by merge
commit 0be36f447e39 ("Merge branch 'v5.15/standard/base'
into v5.15/standard/nxp-sdk-5.15/nxp-soc"). Restore it back.
From: Kevin Hao
The codes which reference to bypass_queue_check label have been
removed by the merge commit fef27b087273 ("Merge branch
'v5.15/standard/base' into v5.15/standard/cn-sdkv5.15/octeon"), so we
also need to drop this dangling label in order to fix the build error
Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v5.15.140 v5.15.141
v6.1.63 v6.1.64 v6.1.65 for the following branches in the linux-yocto.
0352666c1d49 v5.15/standard/sdkv5.10/axxia
ef6b4a29d7c3 v5.15/standard/preempt-rt/sdkv5.10/axxia
17a4f2b6112d v5.15/standard/base
Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v5.15.140 v6.1.63 v6.1.64
for the following branches in the linux-yocto.
5d89d6473be5 v5.15/standard/sdkv5.10/axxia
9e91f3d1ffe4 v5.15/standard/preempt-rt/sdkv5.10/axxia
d218f6d23295 v5.15/standard/base
dc0e13515e5b
On Fri, Nov 24, 2023 at 12:06:45AM -0500, Bruce Ashfield wrote:
> In message: [linux-yocto] spi: cadence-xspi: Wrap the access to
> cdns_xspi_dev::cs_defined in #if
> on 21/11/2023 Kevin Hao wrote:
>
> > From: Kevin Hao
> >
> > The cdns_xspi_dev::c
Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v6.1.63 for the following
branches in the linux-yocto.
d6ca19b1a773 v5.15/standard/sdkv5.10/axxia
fb50e151bae1 v5.15/standard/preempt-rt/sdkv5.10/axxia
ac9d54b0bf0a v5.15/standard/base
105a85f8a9f2
From: Kevin Hao
The cdns_xspi_dev::cs_defined is only defined when
CONFIG_SPI_CADENCE_MRVL_XSPI is enabled. So wrap the access to
cdns_xspi_dev::cs_defined in #if to fix the build failure.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Could you help me merge this patch to the following two branches
On Fri, Nov 10, 2023 at 12:21:49PM +, Kadambathur Subramaniyam, Saravanan
wrote:
> //Changed subject line
> Hi Bruce
> We closed all the internal review comments which Kexin mentioned in his below
> email. He approved the updated patch.
Hi Saravanan,
For the kernel cache change, since
Hi Bruce,
This is a trial merge of the stable kernel v5.15.138 v6.1.62 for the following
branches in the linux-yocto.
574d18041760 v5.15/standard/sdkv5.10/axxia
93bb4527132f v5.15/standard/preempt-rt/sdkv5.10/axxia
f5a3cb02c7d2 v5.15/standard/base
49e93beee1ca
On Wed, Nov 08, 2023 at 05:36:30PM +, Kadambathur Subramaniyam, Saravanan
via lists.yoctoproject.org wrote:
> Hi Bruce,
>
> This pull (v2) is to enable support for board Microchip Polarfire SoC ICICLE
> kit.
> Both standard and rt kernel are well tested against 6.1, these images boots
> well
Hi Bruce,
This is a trial merge of the stable kernel v6.1.61 for the following branches
in the linux-yocto.
84d68d8dc1d6 v6.1/standard/sdkv5.10/axxia
defd1068ac96 v6.1/standard/preempt-rt/sdkv5.10/axxia
96c8d58c9a96 v6.1/standard/base
9e276c93d51b v6.1/standard/preempt-rt/base
From: Kevin Hao
A Woverflow warning was introduced by SDK commit e11fb4e609ab ("linflex:
Correctly clear UARTSR in interrupt mode").
drivers/tty/serial/fsl_linflexuart.c: In function ‘linflex_rxint’:
drivers/tty/serial/fsl_linflexuart.c:629:24: warning: conversion from ‘long
un
Hi Bruce,
This is a trial merge of the stable kernel v5.15.137 v6.1.60 for the following
branches in the linux-yocto.
383dab73512e v5.15/standard/sdkv5.10/axxia
23e4a8c135f0 v5.15/standard/preempt-rt/sdkv5.10/axxia
cfda2504c69b v5.15/standard/base
52265f08381b
Hi Bruce,
This is a trial merge of the stable kernel v5.15.136 v6.1.58 v6.1.59 for the
following branches in the linux-yocto.
876d7300fe9e v5.15/standard/sdkv5.10/axxia
13fe5a251783 v5.15/standard/preempt-rt/sdkv5.10/axxia
2a9cd206a46f v5.15/standard/base
b3bbc5cb8dad
Hi Bruce,
This is a trial merge of the stable kernel v6.1.58 for the following branches
in the linux-yocto.
e322f2028928 v6.1/standard/base
63c662adbec7 v6.1/standard/preempt-rt/base
96c2fc7cdd27 v6.1/standard/ti-sdk-6.1/ti-j7xxx
4bec42afb791
Hi Bruce,
This is a trial merge of the stable kernel v5.15.135 v6.1.56 v6.1.57 for the
following branches in the linux-yocto.
94e728b8227d v5.15/standard/sdkv5.10/axxia
cbe72a82c2b6 v5.15/standard/preempt-rt/sdkv5.10/axxia
dd2a741b1da1 v5.15/standard/base
1d5bfd18dff6
Hi Bruce,
This is a trial merge of the stable kernel v5.15.134 v6.1.56 for the following
branches in the linux-yocto.
99381078d804 v5.15/standard/sdkv5.10/axxia
545d5344ea4b v5.15/standard/preempt-rt/sdkv5.10/axxia
ca8612c8a26d v5.15/standard/base
3a27cb5275b3
From: Kevin Hao
This is the deinit callback introduced by the SDK version, so we should
use this instead of imx6_pcie_host_deinit().
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-6.1/nxp-soc
v6.1/standard/preempt-rt
From: Kevin Hao
The change introduced by commit 6a4480c5e6eb ("hsr: Fix uninit-value
access in fill_frame_info()") were lost when fixing the merge
conflicts. Restore it back.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/s
On Wed, Sep 27, 2023 at 06:53:44PM +0800, Kevin Hao wrote:
> From: Kevin Hao
>
> These were added mistakenly when fixing the merge conflicts.
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v5.
From: Kevin Hao
These were added mistakenly when fixing the merge conflicts.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/cn-sdkv5.15/octeon
v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
include/linux/arm_sdei.h | 2
1 - 100 of 245 matches
Mail list logo
