diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2022-01-20 11:49:49 +0100 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2022-01-21 12:12:42 +0000 |
| commit | 301be4c9464c420e223f56e5fee303b8483727d3 (patch) | |
| tree | bc73cf70b4fb2c6f42bef781a3d326cff9b41663 /docs/lab/testbeds_sm_icx_hw_bios_cfg.md | |
| parent | 295e9a45653fd9fc426dc6f91eceaff7fe497bb8 (diff) | |
feat(doc): Add ICX
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I46b2198d94f21b25061f0bd9bed42ca15bc00aa0
(cherry picked from commit 6844308e3c8db8612d572fdb4f39f7eea02867e9)
Diffstat (limited to 'docs/lab/testbeds_sm_icx_hw_bios_cfg.md')
| -rw-r--r-- | docs/lab/testbeds_sm_icx_hw_bios_cfg.md | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md index d780a7c082..36eabeb18c 100644 --- a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md +++ b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md @@ -1,5 +1,3 @@ -<<<<<<< HEAD (41b698 feat(pxe): Add ICX) -======= # SuperMicro Icelake Servers - HW and BIOS Configuration 1. [Linux lscpu](#linux-lscpu) @@ -1247,4 +1245,3 @@ s67-t37-tg1. 10.30.50.77. 1.00.21. 1.1. F1.00.07. 0D000280. A5.01.24 s71-t212-sut1. 10.30.50.81. 1.00.21. 1.1. F1.00.07. 0D000280. A5.01.24. 8.30 0x8000a49d 1.2926.0. 2.17.4. 3.10 0x8000ad67 1.3106.0. 1.7.16. s72-t212-tg1. 10.30.50.82. 1.00.21. 1.1. F1.00.07. 0D000280. A5.01.24. 8.30 0x8000a49d 1.2926.0. 2.17.4. 3.10 0x8000ad67 1.3106.0. 1.7.16. ``` ->>>>>>> CHANGE (62c4aa feat(ansible): Add ICX) |