Manual Merge public 202205 to resolve conflict introduced by [202205] Update Linux kernel to 5.10.179 #17569#210
Merged
gechiang merged 6 commits intoAzure:202205from Jan 6, 2024
gechiang:202205
Merged
Manual Merge public 202205 to resolve conflict introduced by [202205] Update Linux kernel to 5.10.179 #17569#210gechiang merged 6 commits intoAzure:202205from gechiang:202205
gechiang merged 6 commits intoAzure:202205from
gechiang:202205
Conversation
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
…tomatically (#17586)
…ess for DualToR Active-active configuration (#17511) * [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add changes Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * fix unit Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add c Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * fix test Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add fixes unit Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> --------- Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
gechiang
requested review from
a team,
lguohan,
qiluo-msft and
xumia
as code owners
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…y (#15546) #### Why I did it src/linkmgrd ``` * 4bda49b - (HEAD -> master, origin/master, origin/HEAD) [actions] Support Semgrep by Github Actions (Azure#210) (7 hours ago) [Mai Bui] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…utomatically (#21565) #### Why I did it src/sonic-host-services ``` * 69788c2 - (HEAD -> master, origin/master, origin/HEAD) Fix: Set default values for kdump enhancement (#217) (3 days ago) [Muhammad Ali Hussnain] * d7e8021 - [chassis] make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT acl service (#218) (4 days ago) [Arvindsrinivasan Lakshmi Narasimhan] * d925457 - Fix sudo command failed because root user password expired by password hardening feature issue (#215) (4 days ago) [Hua Liu] * 7e1b280 - reverted ssh_key to ssh_string (#216) (6 days ago) [Muhammad Ali Hussnain] * 741a9df - Handle NotImplementedError in determine-reboot-cause that will be thrown on VS Chassis platform (#211) (7 days ago) [Changrong Wu] * 47f6feb - check sonic-installer message and return proper error code for when image doesn't exist. (#210) (7 days ago) [Dawei Huang] * 1fe9a76 - Updated Key and Path (#209) (7 days ago) [Muhammad Ali Hussnain] * bb0a31c - Adding support for persistent storage and retrieval of DPU reboot-cause (#169) (8 days ago) [rameshraghupathy] * 5e08927 - [hostcfgd] Fix the state machine during eth0 default route check failure (#196) (2 weeks ago) [Vivek] * d2cc1a8 - Add ImageService.set_next_boot for GNOI Activate OS. (#207) (3 weeks ago) [Dawei Huang] * 9c49913 - register image_service and docker_service. (#208) (3 weeks ago) [Dawei Huang] * d88d8d0 - Implementation for ImageService.List (#206) (4 weeks ago) [Dawei Huang] * d7e4df5 - Enabled configuring the default number of kdumps in Linux. (#202) (4 weeks ago) [Mridul Bajpai] * ca9d329 - kdump-remote feature in hostcfgd (#166) (4 weeks ago) [Muhammad Ali Hussnain] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Aug 3, 2025
…AD automatically (#1451) #### Why I did it src/sonic-utilities ``` * 463294ca - (HEAD -> 202503, origin/202503) Merge pull request #213 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 72730f2f - Merge branch '202412' of https://github.com/Azure/sonic-utilities.msft into 202503 (23 hours ago) [Sonic Automation] * 90896399 - [db_migrator] Fix parse_xml fails when minigraph has SonicQosProfile (#210) (2 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merged the following commits from public/202205 as there was a conflict in PR 17569 that needs manual merge resolution.
Why I did it
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)