Skip to content

Zephyr upmerge fixes 07.2026 #728

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.

Sign up for GitHub

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

Open
rlubos wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Zephyr upmerge fixes 07.2026 #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f38576
[nrf toup][nrfconnect] Replace NET_SOCKETS_POLL_MAX
rlubos Jul 14, 2026
eccc2d1
[nrf toup][nrfconnect] Use zephyr/ prefix for generated header includes
rlubos Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/nrfconnect/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ config NET_BUF_RX_COUNT
config NET_BUF_TX_COUNT
default 16

config NET_SOCKETS_POLL_MAX
config ZVFS_POLL_MAX
default 6 if CHIP_WIFI

endif # NETWORKING
Expand Down
4 changes: 2 additions & 2 deletions src/platform/nrfconnect/CHIPDevicePlatformConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#pragma once

#ifndef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
#include "app_version.h"
#include <zephyr/app_version.h>
#endif
#include "autoconf.h"
#include <zephyr/autoconf.h>

// ==================== Platform Adaptations ====================

Expand Down
Loading