Skip to content

Double commit #13789 and #15269 from sonic-net/sonic-buildimage#30

Merged
abdosi merged 1 commit intoAzure:202205from
baorliu:cisco-baorliu-staticroutebfd
Jun 12, 2023
Merged

Double commit #13789 and #15269 from sonic-net/sonic-buildimage#30
abdosi merged 1 commit intoAzure:202205from
baorliu:cisco-baorliu-staticroutebfd

Conversation

@baorliu
Copy link

@baorliu baorliu commented Jun 9, 2023

Double commit the PRs from sonic-net/sonic-buildimage.
Original PR for staticroutebfd:
sonic-net/sonic-buildimage#13789
And a fix for staticroutebfd:
sonic-net/sonic-buildimage#15269

Why I did it

How I did it

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

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

@abdosi
Copy link
Contributor

abdosi commented Jun 12, 2023

@gechiang I am merging this.

@abdosi abdosi merged commit 252d295 into Azure:202205 Jun 12, 2023
gechiang added a commit that referenced this pull request Sep 30, 2023
[submodule][202205] Update submodule sonic-utilities to the latest HEAD automatically
*   ceced56 - (HEAD -> 202205, origin/202205) Merge pull request #30 from alpeshspatel/alpeshspatel/util.msft.202205.mmuconfig (30 hours ago) [abdosi]
|\  
| * 44dbfde - mmuconfig to set threshold for profiles master#2775 (2 days ago) [Alpesh S Patel]
|/  
* 75030e0 - Merge pull request #29 from mssonicbld/sonicbld/202205-merge (3 days ago) [mssonicbld]
* 7df1c6b - Merge branch '202205' of https://github.com/sonic-net/sonic-utilities into 202205 (3 days ago) [Sonic Automation]
* d9bc820 - Handle NotImplementedError exception while changing optoe write max (#2985) (3 days ago) [mihirpat1]
* 4bf29fe - [sonic-package-manager] Increate timeout for sonic-package-manager migrate (#2973) (3 days ago) [Yaqiang Zhu]
@jon-nokia jon-nokia mentioned this pull request Dec 20, 2023
5 tasks
mssonicbld added a commit that referenced this pull request Feb 20, 2025
… automatically (#644)

#### Why I did it
src/sonic-platform-common
```
* 85c9572 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#30) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 7, 2025
…tomatically (#810)

#### Why I did it
src/sonic-linux-kernel
```
* 53b4e98 - (HEAD -> 202412, origin/HEAD, origin/202412) [code sync] Merge code from sonic-net/sonic-linux-kernel:202411 to 202412 (#30) (16 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 10, 2025
…omatically (#834)

#### Why I did it
src/sonic-swss-common
```
* bfcbf59 - (HEAD -> 202412, origin/HEAD, origin/202412) [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (#982) (#30) (21 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld pushed a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Jul 31, 2025
Why I did it
Cherry-pick PR #22849 to update the Nokia PMON submodule
Update Nokia sonic-platform submodule which includes the commits in branch 202405 and 202503.
Include commits:
05abbf6 [IXR7220-D4] Add port leds functionality
d4f4e4d Update Fan Drawer index in cpld and fix fan target speed
4800083 [mackinac] warnings in general build
c5b3a14 [mackinac] adding prom programming spidev; incidental c++ changes without functional impact
fb37c5a [mackinac] working drivers, pcon, sets devices
0c56adf [x3b]Change access permissions for syseeprom
30cbed3 Using PcieUtil utility to check PCIE status
2b41e41 [x1b] modprobe.d/cpuctl.conf
f234d5a [x3b] wait for pcon driver sysfs ready
054d682 [x3b]Fix PSU status check issue (Azure#31)
f6cb50e [X1b] Add support for Nokia X1b platform (Azure#30)
921f9dd Adds CI to build the debian (Azure#29)
7728ef2 [x4][x1b] consolidating shared cpuctl.ko source code from working x3b version
9f73cf4 Fix the reboot-cause fro upgrading from MFG image
7e057f9 [x3b]Update PSU code to adapt the I2C driver modification
c64aba4 Fixed Watchdog and Others reboot-cause
39215bf moving platform_init script output into journal/syslog
4755411 [x3b] combined write/read
3a13b63 Adding bridge code for x3b x1b x4
53a0696 [x3b]Update fan module and thermal algorithm
8052488 [x3b] adds spi bus
0aac79f [x3b]Fix and update fan and thermal modules
169e0d8 Fix reboot-cause for Kernel Panic when kudmp is enabled
dd003e1 [IXR7220-D4] FW Upgrades Support
e143b5f Revert "Reduce traffic loss when the IMM reboots ungracefully"
f7eec2c Revert "Add dependency for IMM ungracefyl reboot service"
b345006 [Chassis] Conditionalize stuffing QFPGA into reset based on kernel AER setting
4652166 [Chassis] Delete FP ports shutdown at LC ungraceful reset time

Work item tracking
Microsoft ADO (number only):
How I did it
Update Nokia sonic-platform submodule which includes the commits in branch 202405 and 202503.
Include commits:
05abbf6 [IXR7220-D4] Add port leds functionality
d4f4e4d Update Fan Drawer index in cpld and fix fan target speed
4800083 [mackinac] warnings in general build
c5b3a14 [mackinac] adding prom programming spidev; incidental c++ changes without functional impact
fb37c5a [mackinac] working drivers, pcon, sets devices
0c56adf [x3b]Change access permissions for syseeprom
30cbed3 Using PcieUtil utility to check PCIE status
2b41e41 [x1b] modprobe.d/cpuctl.conf
f234d5a [x3b] wait for pcon driver sysfs ready
054d682 [x3b]Fix PSU status check issue (Azure#31)
f6cb50e [X1b] Add support for Nokia X1b platform (Azure#30)
921f9dd Adds CI to build the debian (Azure#29)
7728ef2 [x4][x1b] consolidating shared cpuctl.ko source code from working x3b version
9f73cf4 Fix the reboot-cause fro upgrading from MFG image
7e057f9 [x3b]Update PSU code to adapt the I2C driver modification
c64aba4 Fixed Watchdog and Others reboot-cause
39215bf moving platform_init script output into journal/syslog
4755411 [x3b] combined write/read
3a13b63 Adding bridge code for x3b x1b x4
53a0696 [x3b]Update fan module and thermal algorithm
8052488 [x3b] adds spi bus
0aac79f [x3b]Fix and update fan and thermal modules
169e0d8 Fix reboot-cause for Kernel Panic when kudmp is enabled
dd003e1 [IXR7220-D4] FW Upgrades Support
e143b5f Revert "Reduce traffic loss when the IMM reboots ungracefully"
f7eec2c Revert "Add dependency for IMM ungracefyl reboot service"
b345006 [Chassis] Conditionalize stuffing QFPGA into reset based on kernel AER setting
4652166 [Chassis] Delete FP ports shutdown at LC ungraceful reset time

Signed-off-by: mlok <[email protected]>
prabhataravind pushed a commit that referenced this pull request Aug 6, 2025
…test HEAD automatically (#1454)

#### Why I did it
src/sonic-platform-daemons
```
* 10f0697 - (HEAD -> 202506, origin/202506) Merge pull request #30 from mssonicbld/sonicbld/202506-merge (23 hours ago) [mssonicbld]
* b38bd3b - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-daemons into 202506 (24 hours ago) [Sonic Automation]
* 97e7441 - Fix for 22430 - SmartSwitch - Reboot cause for DPUs not updated on complete system reboot (#655) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Aug 22, 2025
…tomatically (#1534)

#### Why I did it
src/sonic-gnmi
```
* 3fe851c - (HEAD -> 202412, origin/202412) Add SHOW implementation for interface transceiver presence (#21) (2 hours ago) [zitingguo-ms]
* 68f5323 - Make the output format of show interface errors and show interface fec status compliant (#30) (5 hours ago) [mssonicbld]
* e7de80f - Add dom and port options for SHOW client (#29) (5 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants