forked from nrfconnect/sdk-nrf
-
Notifications
You must be signed in to change notification settings - Fork 0
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
MarekPieta
wants to merge
5
commits into
rlubos:upmerge-16-05-2024
from
MarekPieta:upmerge_tx_pwr_fix
Closed
bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS #20
MarekPieta
wants to merge
5
commits into
rlubos:upmerge-16-05-2024
from
MarekPieta:upmerge_tx_pwr_fix
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
@rlubos, please do not merge it yet. Waiting for reviews. |
rick1082
approved these changes
May 17, 2024
Approved for the ISO part, will do an update for that project soon, |
rlubos
force-pushed
the
upmerge-16-05-2024
branch
4 times, most recently
from
May 20, 2024 09:28
0650a82
to
d9232b5
Compare
hermabe
approved these changes
May 20, 2024
ppryga-nordic
approved these changes
May 20, 2024
There was a problem hiding this 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
KAGA164
approved these changes
May 20, 2024
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
May 20, 2024 12:29
d9232b5
to
d1ba9b2
Compare
Cherry-picked to the upmerge branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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