|WARNING| pw145473 [PATCH v2] dts: add VLAN methods to testpmd shell

[qemudev@loongson.cn]

Test-Label: loongarch-compilation
Test-Status: WARNING
http://dpdk.org/patch/145473

_apply patch failure_

Submitter: Dean Marx <dmarx@iol.unh.edu>
Date: Tue,  8 Oct 2024 13:15:57 -0400
DPDK git baseline: Repo:dpdk
  Branch: main
  CommitID: e7bc451c996b5882c5d8267725f3d88118009c75

Apply patch set 145473 failed:

Checking patch dts/framework/remote_session/testpmd_shell.py...
Hunk #1 succeeded at 98 (offset -4 lines).
error: while searching for:
            TestPmdParams(**app_params),
            name,
        )
<<<<<<< HEAD
        self._ports = None

    @property
    def ports(self) -> list[TestPmdPort]:
        """The ports of the instance.

        This caches the ports returned by :meth:`show_port_info_all`.
        To force an update of port information, execute :meth:`show_port_info_all` or
        :meth:`show_port_info`.

        Returns: The list of known testpmd ports.
        """
        if self._ports is None:
            return self.show_port_info_all()
        return self._ports

=======
>>>>>>> 8538685a3a86a021c2a634b8f948ae0a39331a26
        self.ports_started = not self._app_params.disable_device_start
        self._ports = None


error: patch failed: dts/framework/remote_session/testpmd_shell.py:670
error: dts/framework/remote_session/testpmd_shell.py: patch does not apply