[SRU][Jammy][PATCH 2/2] UBUNTU: [Config] remove NET_CLS_RSVP and NET_CLS_RSVP6

[Magali Lemes]

As rsvp classifier is removed, update configs accordingly.

CVE-2023-42755
Signed-off-by: Magali Lemes <magali.lemes at canonical.com>
---
 debian.master/abi/amd64/generic.modules      | 2 --
 debian.master/abi/arm64/generic-64k.modules  | 2 --
 debian.master/abi/arm64/generic.modules      | 2 --
 debian.master/abi/armhf/generic-lpae.modules | 2 --
 debian.master/abi/armhf/generic.modules      | 2 --
 debian.master/abi/ppc64el/generic.modules    | 2 --
 debian.master/abi/s390x/generic.modules      | 2 --
 debian.master/config/annotations             | 2 --
 8 files changed, 16 deletions(-)

diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules
index 0d0b6cbf9765..2c16ebcb8c61 100644
--- a/debian.master/abi/amd64/generic.modules
+++ b/debian.master/abi/amd64/generic.modules
@@ -802,8 +802,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules
index df5ee8bb7e85..46a54ba28792 100644
--- a/debian.master/abi/arm64/generic-64k.modules
+++ b/debian.master/abi/arm64/generic-64k.modules
@@ -877,8 +877,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules
index 191a83723340..4ce0ce4f8711 100644
--- a/debian.master/abi/arm64/generic.modules
+++ b/debian.master/abi/arm64/generic.modules
@@ -877,8 +877,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules
index ced05445cb22..1812d9ef4c7b 100644
--- a/debian.master/abi/armhf/generic-lpae.modules
+++ b/debian.master/abi/armhf/generic-lpae.modules
@@ -828,8 +828,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules
index 235d4b617b52..72a0f3f2a477 100644
--- a/debian.master/abi/armhf/generic.modules
+++ b/debian.master/abi/armhf/generic.modules
@@ -837,8 +837,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules
index 6eef96cf1c80..51ef2d8956ad 100644
--- a/debian.master/abi/ppc64el/generic.modules
+++ b/debian.master/abi/ppc64el/generic.modules
@@ -758,8 +758,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cm109
 cm32181
diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules
index e8e97a92a227..a2a7b262efb0 100644
--- a/debian.master/abi/s390x/generic.modules
+++ b/debian.master/abi/s390x/generic.modules
@@ -110,8 +110,6 @@ cls_flower
 cls_fw
 cls_matchall
 cls_route
-cls_rsvp
-cls_rsvp6
 cls_u32
 cmac
 coda
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0ccde23f179d..f8624d0738af 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8016,8 +8016,6 @@ CONFIG_NET_CLS_FLOWER                           policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_MATCHALL                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_RSVP                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_RSVP6                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_U32                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_CORE                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NET_DEVLINK                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-- 
2.34.1