On Tue, Dec 09, 2025 at 10:39:30AM -0500, Bruce Ashfield wrote: > > - For v6.1 octeon branches: > > Two semantic merge conflicts have arisen in the drivers/acpi/pptt.c file > > as a result of > > the API change to acpi_count_levels() introduced by the stable commit. We > > need to adjust > > the parameter of acpi_count_levels() due to this change. > > After comparing your reference to my merge branch, I was also seeing a change > in net/bluetooth/smp.c, I took the changes from your branch. Send me a fixup > patch if I chose wrong.
It appears that the changes in net/bluetooth/smp.c originate from your merge commit. The presence of either '--' or '++' in the combined diff indicates that these modifications are not from the original BSP branch or the stable kernel. This issue closely resembles those we have encountered previously. In any case, the sync patch looks good to me. $ git show 2d864558ddc2 net/bluetooth/smp.c commit 2d864558ddc2 Merge: 1036cc35f6f0 037a102085ac Author: Bruce Ashfield <[email protected]> Date: Tue Dec 9 09:46:29 2025 -0500 Merge branch 'v6.1/standard/base' into v6.1/standard/cn-sdkv5.15/octeon Signed-off-by: Bruce Ashfield <[email protected]> # Conflicts: # drivers/acpi/pptt.c diff --cc net/bluetooth/smp.c index a03920fe44d9,d8a77bfe65a6..9cd07c4577d2 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@@ -883,16 -883,16 +883,9 @@@ static int tk_request(struct l2cap_con hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT) smp->method = JUST_WORKS; -- /* If Just Works, Continue with Zero TK and ask user-space for -- * confirmation */ ++ /* If Just Works, Continue with Zero TK */ if (smp->method == JUST_WORKS) { -- ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, -- hcon->type, -- hcon->dst_type, -- passkey, 1); -- if (ret) -- return ret; -- set_bit(SMP_FLAG_WAIT_USER, &smp->flags); ++ set_bit(SMP_FLAG_TK_VALID, &smp->flags); return 0; } @@@ -2208,7 -2190,7 +2183,7 @@@ mackey_and_ltk if (err) return SMP_UNSPECIFIED; -- if (smp->method == REQ_OOB) { ++ if (smp->method == JUST_WORKS || smp->method == REQ_OOB) { if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) { sc_dhkey_check(smp); SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK); > > - For v6.6 polafire branches: > > Two similar modifications were introduced in both the stable and SDK > > commits, but with > > different variable name. Retain the changes from the SDK commit and > > revert those from > > the stable commit, as there are still patches that depend on the SDK > > modifications. > > 94b3c7558748 ("spi: spi-mem: Allow specifying the byte order in Octal > > DTR mode") > > 6932ca6cce0e ("spi: spi-mem: Allow specifying the byte order in DTR > > mode") > > > > Auto merge took care of most of this, and I grabbed your resolution for > spi-mem.h > I also had another delta spi-mem.c, so I manually sync'd to your reference. The discrepancy in spi-mem.c likely stems from the reversion of the stable commit 94b3c7558748. Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16039): https://lists.yoctoproject.org/g/linux-yocto/message/16039 Mute This Topic: https://lists.yoctoproject.org/mt/116659511/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
