Manual Merge public 202205 to resolve conflict introduced by [202205] Update Linux kernel to 5.10.179 #17569 #210
Conversation
This file contains 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
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,
qiluo-msft,
xumia and
lguohan
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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)