[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: v6.1/stan

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 OP

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 > ("d