Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS #20

Closed

Conversation

MarekPieta
Copy link

@MarekPieta MarekPieta commented May 17, 2024

18c23daee3317c8b4b9ed69f7d8c81112b5185f8 removes CONFIG_BT_HCI_VS_EXT. Align BLE controller configuration with the changes.

PR also aligns code after 484fe3f06c44de897ec0271d8cf36d52300627d7 was added to Zephyr.

Jira: NCSDK-27508

rlubos and others added 5 commits May 16, 2024 15:18
Pull upmerged sdk-zephyr and sdk-mcuboot repositories.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
PORTING.md is now referenced by other docs, hence make sure it's visible
during doc build.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Specifically NET_L2_BT and NET_L2_BT_SHELL.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Align code after 484fe3f was added to
Zephyr.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
18c23da removes CONFIG_BT_HCI_VS_EXT.
Align BLE controller configuration with the changes.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@MarekPieta
Copy link
Author

@rlubos, please do not merge it yet. Waiting for reviews.

@rick1082
Copy link

Approved for the ISO part, will do an update for that project soon,

@rlubos rlubos force-pushed the upmerge-16-05-2024 branch 4 times, most recently from 0650a82 to d9232b5 Compare May 20, 2024 09:28
Copy link

@ppryga-nordic ppryga-nordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked two commits related to Bluetooth

@rlubos rlubos force-pushed the upmerge-16-05-2024 branch from d9232b5 to d1ba9b2 Compare May 20, 2024 12:29
@rlubos
Copy link
Owner

rlubos commented May 20, 2024

Cherry-picked to the upmerge branch.

@rlubos rlubos closed this May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants