Skip to content

Commit db74e3e

Browse files
authored
twister: Forgot to add files to .gitattributes for last PRs (#210)
We still need to keep .gitattributes up to date so the nightly merges don't just wipe out our changes. Signed-off-by: Dennis Ruffer <[email protected]>
1 parent a9e0c2c commit db74e3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+63
-2309
lines changed

.gitattributes

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
# will never be auto-merged into from main. If the file doesn't exist here, then
1717
# any upstream changes will override ours.
1818
.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
1927
.github/workflows/assigner.yml merge=ours
2028
.github/workflows/backport.yml merge=ours
2129
.github/workflows/backport_issue_check.yml merge=ours
@@ -59,6 +67,7 @@ CODEOWNERS merge=ours
5967
README.md merge=ours
6068
README.rst merge=ours
6169
Trademark_License.md merge=ours
70+
VERSION merge=ours
6271
boards/arm/efm32pg_stk3402a/Kconfig.defconfig merge=ours
6372
boards/arm/efm32pg_stk3402a/doc/index.rst merge=ours
6473
boards/arm/efm32pg_stk3402a/efm32pg_stk3402a-pinctrl.dtsi merge=ours
@@ -149,6 +158,7 @@ drivers/sensor/cxd5605/CMakeLists.txt merge=ours
149158
drivers/sensor/cxd5605/Kconfig merge=ours
150159
drivers/sensor/cxd5605/cxd5605.c merge=ours
151160
drivers/sensor/cxd5605/cxd5605.h merge=ours
161+
drivers/sensor/lis2dw12/Kconfig merge=ours
152162
drivers/sensor/lis2dw12/lis2dw12.c merge=ours
153163
drivers/sensor/lis2dw12/lis2dw12.h merge=ours
154164
drivers/sensor/lis2dw12/lis2dw12_trigger.c merge=ours
@@ -224,6 +234,7 @@ samples/drivers/counter/gecko_rtcc/README.rst merge=ours
224234
samples/drivers/counter/gecko_rtcc/prj.conf merge=ours
225235
samples/drivers/counter/gecko_rtcc/sample.yaml merge=ours
226236
samples/drivers/counter/gecko_rtcc/src/main.c merge=ours
237+
samples/modules/nanopb/sample.yaml merge=ours
227238
samples/net/mqtt_publisher/overlay-1sc.conf merge=ours
228239
samples/net/sockets/echo_client/src/echo-client.c merge=ours
229240
samples/sensor/cxd5605_hot/CMakeLists.txt merge=ours
@@ -232,9 +243,11 @@ samples/sensor/cxd5605_hot/prj.conf merge=ours
232243
samples/sensor/cxd5605_hot/src/main.c merge=ours
233244
samples/sensor/cxd5605_hot/uart.yaml merge=ours
234245
samples/sensor/tmp108/src/main.c merge=ours
246+
samples/subsys/nvs/sample.yaml merge=ours
235247
samples/subsys/shell/fs/boards/tmo_dev_edge.conf merge=ours
236248
samples/subsys/shell/shell_module/boards/efm32pg_stk3402a.conf merge=ours
237249
samples/subsys/shell/shell_module/boards/tmo_dev_edge.conf merge=ours
250+
samples/subsys/task_wdt/sample.yaml merge=ours
238251
soc/arm/silabs_exx32/Kconfig merge=ours
239252
soc/arm/silabs_exx32/common/CMakeLists.txt merge=ours
240253
soc/arm/silabs_exx32/common/soc_power.c merge=ours
@@ -249,6 +262,21 @@ subsys/shell/modules/date_service.c merge=ours
249262
subsys/shell/shell_help.c merge=ours
250263
subsys/shell/shell_cmds.c merge=ours
251264
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
252268
tests/drivers/gpio/gpio_basic_api/boards/efm32pg_stk3402a.overlay merge=ours
253269
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
254282
west.yml merge=ours

.github/ISSUE_TEMPLATE/001_bug_report.md

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/002_enhancement.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/004_feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/005_hardware_support.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/006_nomination.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/007_ext-source.md

Lines changed: 0 additions & 68 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/008_bin-blobs.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)