Resolve Merge Conflicts Between sonic-net 202505 and sonic-buildimage-msft 202506 to enable superproject sync#2728

Open

kktheballer wants to merge 33 commits into

Azure:202506from

kktheballer:202506

Commits on Mar 29, 2026

[ci/build]: Upgrade SONiC package versions (#24920)
mssonicbld
authored

Commits on Mar 30, 2026

fix: golang security and security apt upgrade (#26420)
auspham
authored

Commits on Apr 7, 2026

fix: tornato and natsever security (#26460)
auspham
authored

Commits on Apr 8, 2026

[submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#26647)
mssonicbld
authored
[submodule] Update submodule sonic-swss to the latest HEAD automatically (#26648)
mssonicbld
authored

Commits on Apr 9, 2026

Commits on Apr 10, 2026

[submodule] Update submodule sonic-swss to the latest HEAD automatically (#26698)
mssonicbld
authored

Commits on Apr 11, 2026

Enable PORT PHY attribute collection by default (#26716)
mssonicbld
authored

Commits on Apr 12, 2026

[build] Fix grpcio 1.15.1 install failure in arm64 env. (#26682)
mssonicbld
authored

Commits on Apr 14, 2026

[build] Enable pip no build isolation config for swi tools (#26684)
yijingyan2
authored

Commits on Apr 15, 2026

[build] upgrade p4lang package versions (#26732)
yijingyan2
authored

Commits on Apr 16, 2026

[build][202505] Avoid using jsonpath_ng v1.8.0 in sonic slave image. (#26772)
yijingyan2
authored

Commits on Apr 20, 2026

Commits on Apr 21, 2026

[ci/build]: Upgrade SONiC package versions (#26905)
mssonicbld
authored

Commits on Apr 30, 2026

chore: pin ptf_nn_agent.py to use nnpy (#26942)
mssonicbld
authored

Commits on May 2, 2026

fix: security vulnerability docker-ptf (#27091)
auspham
authored

Commits on May 13, 2026

Commits on May 15, 2026

Commits on May 27, 2026

Commits on May 28, 2026

[ci/build]: Upgrade SONiC package versions (#27560)
mssonicbld
authored

Commits on May 31, 2026

[ci/build]: Upgrade SONiC package versions (#27628)
mssonicbld
authored

Commits on Jun 13, 2026

[ci/build]: Upgrade SONiC package versions (#27872)
mssonicbld
authored

Commits on Jun 24, 2026

Commits on Jun 27, 2026

[ci/build]: Upgrade SONiC package versions (#28121)
mssonicbld
authored

Commits on Jul 3, 2026

ci: disable KVM PR tests on 202505, keep build (#28230)
auspham
authored

Commits on Jul 22, 2026

Merge sonic-net/sonic-buildimage 202505 into Azure/sonic-buildimage-msft 202506
kktheballer
committed