[SRU][Lunar][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 f68f106ecc01..bd00228961f0 100644
--- a/debian.master/abi/amd64/generic.modules
+++ b/debian.master/abi/amd64/generic.modules
@@ -833,8 +833,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 94044b5e80d5..8c87208c749c 100644
--- a/debian.master/abi/arm64/generic-64k.modules
+++ b/debian.master/abi/arm64/generic-64k.modules
@@ -923,8 +923,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 abc7e72f0ad3..12d920b1f18c 100644
--- a/debian.master/abi/arm64/generic.modules
+++ b/debian.master/abi/arm64/generic.modules
@@ -923,8 +923,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 b7b6757652db..e09b59d1b4af 100644
--- a/debian.master/abi/armhf/generic-lpae.modules
+++ b/debian.master/abi/armhf/generic-lpae.modules
@@ -889,8 +889,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 e32474950c08..ed209e690b0b 100644
--- a/debian.master/abi/armhf/generic.modules
+++ b/debian.master/abi/armhf/generic.modules
@@ -889,8 +889,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 11bee8b0e6c3..29b294ba02b7 100644
--- a/debian.master/abi/ppc64el/generic.modules
+++ b/debian.master/abi/ppc64el/generic.modules
@@ -791,8 +791,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 fbb91843e886..b1dd7d2501eb 100644
--- a/debian.master/abi/s390x/generic.modules
+++ b/debian.master/abi/s390x/generic.modules
@@ -112,8 +112,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 63d80fb7969e..07e66789c1b3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8310,8 +8310,6 @@ CONFIG_NET_CLS_FLOWER                           policy<{'amd64': 'm', 'arm64': '
 CONFIG_NET_CLS_FW                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_MATCHALL                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_ROUTE4                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_RSVP                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_NET_CLS_RSVP6                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CLS_U32                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_NET_CORE                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_NET_DEVLINK                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-- 
2.34.1