Skip to content

Zephyr upmerge fixes 07.2026 - #728

Open
rlubos wants to merge 2 commits into
nrfconnect:masterfrom
rlubos:upmerge-07-2026
Open

rlubos wants to merge 2 commits into
nrfconnect:masterfrom
rlubos:upmerge-07-2026

Conversation

@rlubos

@rlubos rlubos commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Summary

Upmerge fixes

Testing

Upmerge CI

NCS PR: nrfconnect/sdk-nrf/pull/30168

manifest-pr-skip

rlubos added 2 commits July 15, 2026 10:58
Replace NET_SOCKETS_POLL_MAX with ZVFS_POLL_MAX, as the former is now
removed from Zephyr, after being deprecated since Zephyr 4.0.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Upstream Zephyr disabled CONFIG_LEGACY_GENERATED_INCLUDE_PATH by default,
so build-time generated headers must use the zephyr/ prefixed paths.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos

rlubos commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

@nrfconnect/ncs-matter Note that this PR will no longer be used with the upmerge after matter was removed from the west.yml - I'll leave it up to you to decide if you want to integrate the fixes or not.

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.

1 participant