16
16
# will never be auto-merged into from main. If the file doesn't exist here, then
17
17
# any upstream changes will override ours.
18
18
.gitattributes merge =ours
19
+ .github /ISSUE_TEMPLATE /001_bug_report.md
20
+ .github /ISSUE_TEMPLATE /002_enhancement.md
21
+ .github /ISSUE_TEMPLATE /003_rfc-proposal.md
22
+ .github /ISSUE_TEMPLATE /004_feature_request.md
23
+ .github /ISSUE_TEMPLATE /005_hardware_support.md
24
+ .github /ISSUE_TEMPLATE /006_nomination.md
25
+ .github /ISSUE_TEMPLATE /007_ext-source.md
26
+ .github /ISSUE_TEMPLATE /008_bin-blobs.md
19
27
.github /workflows /assigner.yml merge =ours
20
28
.github /workflows /backport.yml merge =ours
21
29
.github /workflows /backport_issue_check.yml merge =ours
@@ -59,6 +67,7 @@ CODEOWNERS merge=ours
59
67
README.md merge =ours
60
68
README.rst merge =ours
61
69
Trademark_License.md merge =ours
70
+ VERSION merge =ours
62
71
boards /arm /efm32pg_stk3402a /Kconfig.defconfig merge =ours
63
72
boards /arm /efm32pg_stk3402a /doc /index.rst merge =ours
64
73
boards /arm /efm32pg_stk3402a /efm32pg_stk3402a-pinctrl.dtsi merge =ours
@@ -149,6 +158,7 @@ drivers/sensor/cxd5605/CMakeLists.txt merge=ours
149
158
drivers /sensor /cxd5605 /Kconfig merge =ours
150
159
drivers /sensor /cxd5605 /cxd5605.c merge =ours
151
160
drivers /sensor /cxd5605 /cxd5605.h merge =ours
161
+ drivers /sensor /lis2dw12 /Kconfig merge =ours
152
162
drivers /sensor /lis2dw12 /lis2dw12.c merge =ours
153
163
drivers /sensor /lis2dw12 /lis2dw12.h merge =ours
154
164
drivers /sensor /lis2dw12 /lis2dw12_trigger.c merge =ours
@@ -224,6 +234,7 @@ samples/drivers/counter/gecko_rtcc/README.rst merge=ours
224
234
samples /drivers /counter /gecko_rtcc /prj.conf merge =ours
225
235
samples /drivers /counter /gecko_rtcc /sample.yaml merge =ours
226
236
samples /drivers /counter /gecko_rtcc /src /main.c merge =ours
237
+ samples /modules /nanopb /sample.yaml merge =ours
227
238
samples /net /mqtt_publisher /overlay-1sc.conf merge =ours
228
239
samples /net /sockets /echo_client /src /echo-client.c merge =ours
229
240
samples /sensor /cxd5605_hot /CMakeLists.txt merge =ours
@@ -232,9 +243,11 @@ samples/sensor/cxd5605_hot/prj.conf merge=ours
232
243
samples /sensor /cxd5605_hot /src /main.c merge =ours
233
244
samples /sensor /cxd5605_hot /uart.yaml merge =ours
234
245
samples /sensor /tmp108 /src /main.c merge =ours
246
+ samples /subsys /nvs /sample.yaml merge =ours
235
247
samples /subsys /shell /fs /boards /tmo_dev_edge.conf merge =ours
236
248
samples /subsys /shell /shell_module /boards /efm32pg_stk3402a.conf merge =ours
237
249
samples /subsys /shell /shell_module /boards /tmo_dev_edge.conf merge =ours
250
+ samples /subsys /task_wdt /sample.yaml merge =ours
238
251
soc /arm /silabs_exx32 /Kconfig merge =ours
239
252
soc /arm /silabs_exx32 /common /CMakeLists.txt merge =ours
240
253
soc /arm /silabs_exx32 /common /soc_power.c merge =ours
@@ -249,6 +262,21 @@ subsys/shell/modules/date_service.c merge=ours
249
262
subsys /shell /shell_help.c merge =ours
250
263
subsys /shell /shell_cmds.c merge =ours
251
264
subsys /shell /shell_ops.c merge =ours
265
+ tests /benchmarks /sched /testcase.yaml merge =ours
266
+ tests /drivers /counter /counter_basic_api /testcase.yaml merge =ours
267
+ tests /drivers /flash /common /testcase.yaml merge =ours
252
268
tests /drivers /gpio /gpio_basic_api /boards /efm32pg_stk3402a.overlay merge =ours
253
269
tests /drivers /regulator /fixed /boards /efm32pg_stk3402a.overlay merge =ours
270
+ tests /kernel /mem_slab /mslab /testcase.yaml merge =ours
271
+ tests /kernel /usage /thread_runtime_stats /testcase.yaml merge =ours
272
+ tests /kernel /workq /work_queue /testcase.yaml merge =ours
273
+ tests /lib /cmsis_dsp /filtering /testcase.yaml merge =ours
274
+ tests /subsys /dsp /basicmath /testcase.yaml merge =ours
275
+ tests /subsys /jwt /testcase.yaml merge =ours
276
+ tests /subsys /logging /log_backend_init /testcase.yaml merge =ours
277
+ tests /subsys /logging /log_core_additional /testcase.yaml merge =ours
278
+ tests /subsys /logging /log_link_order /testcase.yaml mereg =ours
279
+ tests /subsys /logging /log_timestamp /testcase.yaml merge =ours
280
+ tests /subsys /portability /cmsis_rtos_v2 /testcase.yaml merge =ours
281
+ tests /subsys /rtio /rtio_api /testcase.yaml merge =ours
254
282
west.yml merge =ours
0 commit comments