[linux-yocto][linux-yocto v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx] ti-j7xxx adds preempt-rt kernel patches to upgrade TI SDK 09_00_01_02

2023-09-27 Thread Xulin Sun via lists.yoctoproject.org
Hi Bruce, Could you please help to merge below patches to the preempt-rt kernel branch "v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx"? This is preempt-rt kernel to upgrade BSP to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02. The following changes since commit

[linux-yocto][linux-yocto v6.1/standard/ti-sdk-6.1/ti-j7xxx] ti-j7xxx kernel part to upgrade to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02

2023-09-27 Thread Xulin Sun via lists.yoctoproject.org
Hi Bruce, Could you please help to merge below patches to kernel branch "v6.1/standard/ti-sdk-6.1/ti-j7xxx"? This is to upgrade BSP to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02. The following changes since commit 122d72613aea7d4f4673c70020eb9a0fc41c9e51:   Merge branch

Re: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk

2023-09-27 Thread Bruce Ashfield
In message: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk on 27/09/2023 quanyang.w...@windriver.com wrote: > From: Quanyang Wang > > The kernel option OPEN_DICE has been removed in commit 9989598547560 > ("drivers: misc: Add

Re: [linux-yocto] pci: dwc: pci-imx6: Set the deinit callback to imx6_pcie_host_deinit()

2023-09-27 Thread Bruce Ashfield
In message: [linux-yocto] pci: dwc: pci-imx6: Set the deinit callback to imx6_pcie_host_deinit() on 27/09/2023 Kevin Hao wrote: > 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

Re: [linux-yocto] net: hsr: Reapply the change for fill_frame_info()

2023-09-27 Thread Bruce Ashfield
In message: [linux-yocto] net: hsr: Reapply the change for fill_frame_info() on 27/09/2023 Kevin Hao wrote: > 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. >

Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()

2023-09-27 Thread Bruce Ashfield
In message: Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init() on 27/09/2023 Kevin Hao wrote: > 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

Re: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk

2023-09-27 Thread Bruce Ashfield
This is the second chunk that my sanity script missed. Something is clearly wrong. Thanks for the fix, I was going to complete my release activities on the stable kernel's today and this saves me time. Bruce On Wed, Sep 27, 2023 at 8:01 AM wrote: > From: Quanyang Wang > > The kernel option

[linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk

2023-09-27 Thread quanyang.wang via lists.yoctoproject.org
From: Quanyang Wang The kernel option OPEN_DICE has been removed in commit 9989598547560 ("drivers: misc: Add Support for TMR Manager"). Remove it to fix the merge conflicted hunk. Signed-off-by: Quanyang Wang --- Hi Bruce, Would you please help merge this patch to the branch:

Re: [linux-yocto] jbd2: Drop the merge conflicted hunk

2023-09-27 Thread Bruce Ashfield
Hmm. This should have been picked up by my sanity scripts. I'll have to figure out what went wrong. Bruce On Wed, Sep 27, 2023 at 5:02 AM Kevin Hao wrote: > From: Kevin Hao > > And the transaction->t_handle_lock is also not needed in the new > codes. > > Signed-off-by: Kevin Hao > --- > Hi

[linux-yocto] pci: dwc: pci-imx6: Set the deinit callback to imx6_pcie_host_deinit()

2023-09-27 Thread Kevin Hao
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

[linux-yocto] net: hsr: Reapply the change for fill_frame_info()

2023-09-27 Thread Kevin Hao
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:

Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()

2023-09-27 Thread Kevin Hao
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.15/standard/cn-sdkv5.15/octeon >

[linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()

2023-09-27 Thread Kevin Hao
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 --

[linux-yocto] jbd2: Drop the merge conflicted hunk

2023-09-27 Thread Kevin Hao
From: Kevin Hao And the transaction->t_handle_lock is also not needed in the new codes. Signed-off-by: Kevin Hao --- Hi Bruce, Please help me merge this into the v5.15/standard/base branch. fs/jbd2/transaction.c | 21 - 1 file changed, 21 deletions(-) diff --git