From: David S. Miller <davem@davemloft.net>
Date: Mon, 4 Jun 2018 14:08:46 +0000 (-0400)
Subject: Merge branch 'selftests-mirror_vlan-fixes'
X-Git-Tag: v5.4.17~5893^2~64
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1ec23c5407f1f901b64cb9b7549a2ba4a36d613e;p=arm%2Flinux.git

Merge branch 'selftests-mirror_vlan-fixes'

Petr Machata says:

====================
selftests: forwarding: mirror_vlan: Fixlets

This patchset includes two small fixes for the tests that were
introduced in commit 1bb58d2d3cbe ("Merge branch
'Mirroring-tests-involving-VLAN'").

In patch #1, a "tc action trap" is uninstalled after the suite runs,
instead of being installed again.

In patch #2, a test in suite is renamed to differentiate it from another
test of the same name.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1ec23c5407f1f901b64cb9b7549a2ba4a36d613e