On Mon, Aug 19, 2024 at 12:01:07AM -0400, Bruce Ashfield wrote:
> It isn't quite that simple.
>
> There's a merge conflict with those branches due to the fixup
> change being in preempt-rt/base, so I can't simply revert the
> merge commit as it contains other changes.
>
> I can always do a -Xours
This duplicate code were added by merge commit 8ecba9a7df3f ("Merge
branch 'v5.15/standard/base' into v5.15/standard/nxp-sdk-5.15/nxp-soc"),
but there's already a similar piece of code a few lines above this
segment.
if (!imx_scu_clk_is_valid(rsrc_id))
return ERR_PTR(-EINVA
On Thu, Jul 27, 2023 at 01:59:38PM +0800, Kevin Hao wrote:
> After the merge of stable v5.15.122 stable kernel (commit 4900bde55da2),
> two blocks to handle the BNB (bus not busy) interrupt were introduced.
> One was added by SDK commit 622176d24add ("i2c: xiic: Fix Tx Interrupt
> path for grouped
After the merge of stable v5.15.122 stable kernel (commit 4900bde55da2),
two blocks to handle the BNB (bus not busy) interrupt were introduced.
One was added by SDK commit 622176d24add ("i2c: xiic: Fix Tx Interrupt
path for grouped messages"), and the other was added by stable commit
9eaef43fef90 (
