Skip to content

[mellanox] Update SDK/FW pointers#1945

Closed
stepanblyschak wants to merge 1 commit intosonic-net:masterfrom
stepanblyschak:master
Closed

[mellanox] Update SDK/FW pointers#1945
stepanblyschak wants to merge 1 commit intosonic-net:masterfrom
stepanblyschak:master

Conversation

@stepanblyschak
Copy link
Collaborator

Signed-off-by: Stepan Blyschak stepanb@mellanox.com

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
@lguohan
Copy link
Collaborator

lguohan commented Aug 17, 2018

is this sai 1.3.3?

@liatgrozovik
Copy link

@lguohan IMO this is not sai 1.33. it was before it was request.
Is SAI 1.33 was already approved and is updated? if so we will make this one aligned with SAI 1.33 as well

@liatgrozovik
Copy link

But since SAI 1.33 was not yet integrated can we merge this one and then have another update for SAI 1.3.3?

@lguohan
Copy link
Collaborator

lguohan commented Aug 20, 2018

sai 1.3.3 is already integrated.

judyjoseph added a commit that referenced this pull request Oct 7, 2021
[202106 6e895ad] Revert "[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857)" (#1945)
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Dec 14, 2021
32d18d25 [Reclaiming buffer][202012] Database migrator for reclaiming buffer (sonic-net#1898)
44ec4c8b [202012] [generate_dump] allow to extend dump with plugin scripts (sonic-net#1945)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Dec 31, 2021
466807e2 Revert "[202012] [generate_dump] allow to extend dump with plugin scripts (sonic-net#1945)" (sonic-net#1993)
b6fb2fda [soft-reboot] Add support for platforms based on Device Tree (sonic-net#1963)
32d18d25 [Reclaiming buffer][202012] Database migrator for reclaiming buffer (sonic-net#1898)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
liat-grozovik pushed a commit that referenced this pull request Jan 2, 2022
Update submodule sonic-utilities that contains the following commits:

Revert "[202012] [generate_dump] allow to extend dump with plugin scripts (#1945)" (#1993)
[soft-reboot] Add support for platforms based on Device Tree (#1963)
[Reclaiming buffer][202012] Database migrator for reclaiming buffer (#1898)
[202012] [generate_dump] allow to extend dump with plugin scripts (#1945)

Signed-off-by: dprital <drorp@nvidia.com>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (sonic-net#1857)" (sonic-net#1945)

This reverts commit 3d6b1f0.

Fix sonic-net#8893

What I did
This commit had earlier caused issue on master image warmboot - sonic-net#8722

To fix this issue, this PR was created to retreat sonic-swss head on buildimage - sonic-net#8732

Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance:
sonic-net#8839

And, warm-reboot again broke for the same reason.

This change is so that any other swss submodule update on buildimage will not fail warmboot again.
Staphylo pushed a commit to Staphylo/sonic-buildimage that referenced this pull request Feb 5, 2026
<!--
Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

** Make sure all your commits include a signature generated with `git
commit -s` **

If this is a bug fix, make sure your description includes "fixes #xxxx",
or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->
#### Why I did it
Manually resolve 202412 conflicts
sonic-net#25107
This PR fixes a service name conflict in the otel container's monit
configuration. The monit program check name was incorrectly using
container_memory_telemetry instead of container_memory_otel, which would
conflict with the telemetry container's monitoring configuration.
##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Fixed a service name conflict in the otel container's monit
configuration.
#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Janet Cui <janet970527@gmail.com>
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.

4 participants