* Hide Mellanox sniffer CLI on other platforms
* Set enable/disable to be the argument of sniffer command rather than the sub-command

[swss]
[acl] Replace IP_PROTOCOL with NEXT_HEADER for IPv6 ACL tables (#1458)
[acl] Refactor port OID retrieval into aclorch (#1462)
Fix issue #5157 by identifying the dependency among objects and avoiding releasing an object still being referenced (#1440)
[mock tests] Update MockDBConnector to match new swsscommon interface (#1465)

[swss-common]
netlink: Setting nl_socket buffer size to 3M from 2M (#391)
Added support in Swig file to cast Selectable object to Subscriber Table object (#394)
[warm reboot] Warm Reboot Support for EVPN VXLAN (#350)
Implement DBInterface/SonicV2Connector in C++ (#387)
Fix memory leak if a RedisCommand object were to be reused (#392)

Signed-off-by: Danny Allen <daall@microsoft.com>

[swss]
[acl] Replace IP_PROTOCOL with NEXT_HEADER for IPv6 ACL tables (sonic-net#1458)
[acl] Refactor port OID retrieval into aclorch (sonic-net#1462)
Fix issue sonic-net#5157 by identifying the dependency among objects and avoiding releasing an object still being referenced (sonic-net#1440)
[mock tests] Update MockDBConnector to match new swsscommon interface (sonic-net#1465)

[swss-common]
netlink: Setting nl_socket buffer size to 3M from 2M (sonic-net#391)
Added support in Swig file to cast Selectable object to Subscriber Table object (sonic-net#394)
[warm reboot] Warm Reboot Support for EVPN VXLAN (sonic-net#350)
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
Fix memory leak if a RedisCommand object were to be reused (sonic-net#392)

Signed-off-by: Danny Allen <daall@microsoft.com>

…tion may return None (sonic-net#350)

Fix unit test failure

… automatically (#14694)

src/sonic-platform-common

* 24009de - (HEAD -> 202205, origin/202205) Fix issue: should always check return value of a function if the function may return None (#350) (#356) (3 hours ago) [Junchao-Mellanox]

…tomatically (#17056)

#### Why I did it
src/sonic-linux-kernel
```
* a75a3df - (HEAD -> master, origin/master, origin/HEAD) arm64: Kconfig inclusions to fix PCI hang and MTD detection (#350) (3 hours ago) [Pavan Naregundi]
```
#### How I did it
#### How to verify it
#### Description for the changelog

…sonic-buildimage into internal

1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`:
```
<<<<<<< HEAD
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev
=======
{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
>>>>>>> 274d320
```

Accepted both changes, after resolved:
```
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev

{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
```

2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled.
So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit:
![image (2).png](https://dev.azure.com/msazure/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/8721f84d-7905-4f85-b5f1-0e19e8eac66b/pullRequests/9025464/attachments/image%20%282%29.png)

Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068

* update cpldupdate command line

…t#350)

* arm64: Select CONFIG_PHY_MVEBU_CP110_COMPHY

This patch selects CONFIG_PHY_MVEBU_CP110_COMPHY with 'y' to fix a
PCI hang.

Change-Id: I175cf64889ed37036bc73d8a06ba8f71e3f23d6d
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* arm64: Select CONFIG_SPI_ORION

This patch selects CONFIG_SPI_ORION with 'm' to fix mtd partition
detection issue.

Change-Id: I3a59adfa7d9a03822cf555ea32c78954ef7e51af
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

---------

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>