diff -pruN 5.15.0-1/debian/changelog 5.15.0-1ubuntu2/debian/changelog
--- 5.15.0-1/debian/changelog	2021-11-05 23:08:14.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/changelog	2022-03-24 11:56:47.000000000 +0000
@@ -1,3 +1,23 @@
+iproute2 (5.15.0-1ubuntu2) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 24 Mar 2022 12:56:47 +0100
+
+iproute2 (5.15.0-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Mon, 29 Nov 2021 15:20:43 +0000
+
 iproute2 (5.15.0-1) unstable; urgency=medium
 
   * Update upstream source from tag 'upstream/5.15.0'
@@ -30,6 +50,26 @@ iproute2 (5.13.0-1) experimental; urgenc
 
  -- Luca Boccassi <bluca@debian.org>  Mon, 26 Jul 2021 10:56:50 +0100
 
+iproute2 (5.10.0-4ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:13:03 +0200
+
+iproute2 (5.10.0-4ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 17 Mar 2021 09:56:39 -0700
+
 iproute2 (5.10.0-4) unstable; urgency=medium
 
   * Backport 0012-iproute-force-rtm_dst_len-to-32-128.patch to fix ip
@@ -39,12 +79,40 @@ iproute2 (5.10.0-4) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Fri, 05 Feb 2021 23:34:59 +0000
 
+iproute2 (5.10.0-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 29 Jan 2021 12:20:58 -0800
+
 iproute2 (5.10.0-3) unstable; urgency=medium
 
   * Backport patches to fix ip vrf exec (Closes: #980046)
 
  -- Luca Boccassi <bluca@debian.org>  Sun, 17 Jan 2021 23:11:31 +0000
 
+iproute2 (5.10.0-2ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 06 Jan 2021 16:38:00 -0800
+
 iproute2 (5.10.0-2) unstable; urgency=medium
 
   * Backport patches from iproute2-next to support libbpf
@@ -61,6 +129,20 @@ iproute2 (5.10.0-1) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Sun, 20 Dec 2020 22:47:37 +0000
 
+iproute2 (5.9.0-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Oct 2020 17:50:27 -0700
+
 iproute2 (5.9.0-1) unstable; urgency=medium
 
   * Update upstream source from tag 'upstream/5.9.0'
@@ -74,6 +156,20 @@ iproute2 (5.8.0-1) unstable; urgency=med
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 12 Aug 2020 13:54:32 +0100
 
+iproute2 (5.7.0-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 09 Jun 2020 14:13:18 -0700
+
 iproute2 (5.7.0-1) unstable; urgency=medium
 
   * Update upstream source from tag 'upstream/5.7.0'
@@ -81,6 +177,20 @@ iproute2 (5.7.0-1) unstable; urgency=med
 
  -- Luca Boccassi <bluca@debian.org>  Sat, 06 Jun 2020 12:27:27 +0100
 
+iproute2 (5.6.0-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 May 2020 15:23:39 -0700
+
 iproute2 (5.6.0-1) unstable; urgency=medium
 
   * Update upstream source from tag 'upstream/5.6.0'
@@ -93,6 +203,26 @@ iproute2 (5.6.0-1) unstable; urgency=med
 
  -- Luca Boccassi <bluca@debian.org>  Fri, 03 Apr 2020 10:03:30 +0100
 
+iproute2 (5.5.0-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+  * Dropped changes, included in Debian:
+    - Make autopkgtests cross-test-friendly.
+  * Dropped changes, included upstream:
+    - debian/patches/git-tunnel-creation.patch:
+      backport upstream change to fix a tunnel creation problem which is
+      leading to a failure on the network-manager ci 
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 09:21:59 -0800
+
 iproute2 (5.5.0-1) unstable; urgency=medium
 
   [ Steve Langasek ]
@@ -123,6 +253,37 @@ iproute2 (5.3.0-1) unstable; urgency=med
 
  -- Luca Boccassi <bluca@debian.org>  Fri, 27 Sep 2019 12:17:59 +0100
 
+iproute2 (5.2.0-1ubuntu3) focal; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 21 Jan 2020 16:22:08 -0800
+
+iproute2 (5.2.0-1ubuntu2) eoan; urgency=medium
+
+  * debian/patches/git-tunnel-creation.patch:
+    - backport upstream change to fix a tunnel creation problem which is
+      leading to a failure on the network-manager ci 
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 10 Oct 2019 11:50:20 +0200
+
+iproute2 (5.2.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian testing. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+  * Dropped changes:
+    - d/p/1005-lib-suppress-error-msg-when-filling-the-cache.patch
+      Already included upstream in 5.2.0.
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Thu, 08 Aug 2019 11:18:17 +0200
+
 iproute2 (5.2.0-1) unstable; urgency=medium
 
   * Use /run/netns rather than /var/run/netns. Allows one to manage namespaces
@@ -134,6 +295,34 @@ iproute2 (5.2.0-1) unstable; urgency=med
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 09 Jul 2019 20:52:47 +0100
 
+iproute2 (5.1.0-1ubuntu2) eoan; urgency=medium
+
+  * Add: d/p/1005-lib-suppress-error-msg-when-filling-the-cache.patch
+    Suppress meaningless error message during interface setup.
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Wed, 10 Jul 2019 16:38:52 +0200
+
+iproute2 (5.1.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian experimental. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+    - Refresh: Ubuntu Fan driver (V2/3/4) patches
+  * Dropped changes:
+    - d/p/1005-ubuntu-fix-testsuite-kenv.patch (upstream)
+    - d/p/1006-ubuntu-iprule-fix-output.patch (upstream
+    - d/p/ss-review-ssfilter.patch (upstream)
+    - Set debhelper dependency to >= 10 (upstream)
+    - Set compat level 10 (upstream)
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Mon, 17 Jun 2019 11:15:33 +0200
+
 iproute2 (5.1.0-1) experimental; urgency=medium
 
   * Update upstream source from tag 'upstream/5.1.0'
@@ -206,6 +395,43 @@ iproute2 (4.18.0-2) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 28 Aug 2018 16:55:44 +0100
 
+iproute2 (4.18.0-1ubuntu3) eoan; urgency=medium
+
+  * d/p/ss-review-ssfilter.patch: fixed issue with ss and ssfilter
+    where ssfilter rejects single expressions if enclosed in
+    braces (LP: #1831775)
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Wed, 05 Jun 2019 21:26:00 -0300
+
+iproute2 (4.18.0-1ubuntu2) cosmic; urgency=low
+
+  * d/p/1006-ubuntu-iprule-fix-output.patch
+    Fix destination prefix output of "ip rule show" (LP: #1789431).
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Tue, 28 Aug 2018 16:38:47 +0200
+
+iproute2 (4.18.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - debian/patches/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+    - Refresh: Ubuntu Fan driver (V2/3/4) patches
+      Patches updated to apply against upstream 4.18 release.
+  * Added changes:
+    - debian/patches/1005-ubuntu-fix-testsuite-kenv.patch
+      Fix testsuite failure if there are too many kernel config
+      options.
+    - Set debhelper dependency to >= 10 (no further changes needed)
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Wed, 22 Aug 2018 09:54:04 +0200
+
 iproute2 (4.18.0-1) experimental; urgency=medium
 
   * Add Brazilian Portuguese translation for Debconf template. Thanks
@@ -236,6 +462,22 @@ iproute2 (4.17.0-1) experimental; urgenc
 
  -- Luca Boccassi <bluca@debian.org>  Sat, 09 Jun 2018 17:45:11 +0100
 
+iproute2 (4.16.0-4ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch [refreshed]
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch [refreshed]
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch [refreshed]
+      Ubuntu FAN driver support VXLAN V4.
+    - drop debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+  * Dropped (upstream)
+    - d/p/netns-allow-negative-nsid: permit negative nsid using "auto".
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Mon, 30 Jul 2018 16:55:35 +0200
+
 iproute2 (4.16.0-4) unstable; urgency=medium
 
   * Backport patch to fix regression in v6 automated parsing.
@@ -288,6 +530,32 @@ iproute2 (4.15.0-3) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Mon, 12 Mar 2018 22:46:24 +0000
 
+iproute2 (4.15.0-2ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+      Ubuntu FAN driver support VXLAN V4
+    - drop debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+    - Add: d/p/netns-allow-negative-nsid: permit negative nsid using "auto"
+  * Dropped changes (in Debian):
+    - follow upstream dropping the old ip documentation (of 1999)
+    - d/rules: consider DEB_*_GNU_TYPE from env
+    - d/control: bump debhelper dependency and Standards-Version
+    - drop 0003-fix-segfault-with-iptables-1.6.patch (upstream)
+    - d/control: fix lintian priority-extra-is-replaced-by-priority-optional
+    - d/t/control: d/t/testsuite.sh: add iproute2 testsuite as autopkgtest
+  * Dropped changes (upstream):
+    - d/p/fix-testsuite-broken-pipes.patch: avoid broken pipe errors in tests
+  * Added changes:
+   - Refresh: d/p/*ubuntu-poc-fan-driver*.patch to latest upstream
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Mon, 26 Feb 2018 16:21:30 +0100
+
 iproute2 (4.15.0-2) unstable; urgency=medium
 
   * Update upstream git repository URL. (Closes: #888804)
@@ -338,6 +606,58 @@ iproute2 (4.14.1-1) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Sat, 23 Dec 2017 14:55:10 +0100
 
+iproute2 (4.14.1-0ubuntu3) bionic; urgency=medium
+
+  [ Christian Brauner ]
+  * d/p/netns-allow-negative-nsid: permit negative nsid using "auto".
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Thu, 15 Feb 2018 15:03:56 +0000
+
+iproute2 (4.14.1-0ubuntu2) bionic; urgency=medium
+
+  * d/p/1002-ubuntu-poc-fan-driver-vxlan.patch: update to fix fan-map
+    processing in vxlan_parse_opt in new version of iproute2.
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 11 Dec 2017 12:13:50 +0100
+
+iproute2 (4.14.1-0ubuntu1) bionic; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Merge from Debian unstable AND latest upstream (LP: #1726730)
+    (LP: #1735032). Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+      Ubuntu FAN driver support VXLAN V4.
+  * Dropped changes (upstream now)
+    - Fix ip maddr show (LP 1732032):
+      - d/p/1003-ip-maddr-fix-igmp-parsing.patch: fix igmp parsing when iface is
+        long
+      - d/p/1004-ip-maddr-avoid-uninitialized-data.patch: avoid accessing
+        uninitialized data
+      - d/p/1005-ip-maddr-fix-filtering-by-device.patch: fix filtering
+        by device
+    - d/p/1006-fix-undeclared-UINT16_MAX.patch: FTBFS: tc: include stdint.h
+      explicitly for UINT16_MAX (LP 1735158)
+  * Added changes
+    - drop 0003-fix-segfault-with-iptables-1.6.patch (upstream)
+    - update d/p/*ubuntu-poc-fan-driver*.patch to latest upstream
+    - d/control: fix lintian priority-extra-is-replaced-by-priority-optional
+    - d/t/control: d/t/testsuite.sh: add iproute2 testsuite as autopkgtest
+    - d/p/fix-testsuite-broken-pipes.patch: avoid broken pipe errors in tests
+
+  [ Julian Wollrath <jwollrath@web.de> ]
+  * Added changes based on suggested 4.14.1-0 changes for Debian in bug 879854
+    - dropped d/p/0001-Add-moo-feature.patch (isn't needed)
+    - follow upstream dropping the old ip documentation (of 1999)
+    - d/rules: consider DEB_*_GNU_TYPE from env
+    - d/control: bump debhelper dependency and Standards-Version
+    - set compat level 10 (no further changes needed)
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 30 Nov 2017 14:17:25 +0100
+
 iproute2 (4.13.0-1) unstable; urgency=medium
 
   * Merge tag 'upstream/4.13.0' (Closes: #879854)
@@ -368,6 +688,44 @@ iproute2 (4.9.0-2) unstable; urgency=med
 
  -- Andreas Henriksson <andreas@fatal.se>  Thu, 14 Sep 2017 11:01:46 +0200
 
+iproute2 (4.9.0-1ubuntu3) bionic; urgency=medium
+
+  * Fix ip maddr show (LP: #1732032):
+    - d/p/1003-ip-maddr-fix-igmp-parsing.patch: fix igmp parsing when iface is
+      long
+    - d/p/1004-ip-maddr-avoid-uninitialized-data.patch: avoid accessing
+      uninitialized data
+    - d/p/1005-ip-maddr-fix-filtering-by-device.patch: fix filtering
+      by device
+  * d/p/1006-fix-undeclared-UINT16_MAX.patch: FTBFS: tc: include stdint.h
+    explicitly for UINT16_MAX (LP: #1735158)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Wed, 29 Nov 2017 09:35:46 -0200
+
+iproute2 (4.9.0-1ubuntu2) artful; urgency=medium
+
+  * No-change rebuild against latest iptables
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 18 Jun 2017 23:59:24 -0400
+
+iproute2 (4.9.0-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+   - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+     Ubuntu FAN driver support VXLAN V4.
+  * Drop the following, fixed in debian:
+   - d/p/1003-fix-variable-in-libnetlink.patch (LP: #1522371)
+   - Add TIPC support (LP: #1508225):
+      - d/control: add libmnl-dev to BDs, to include TIPC support.
+      - d/iproute2.install: add tipc binary.
+  * Rebased FAN quilt patches on to latest upstream code.
+
+ -- Jon Grimm <jon.grimm@canonical.com>  Fri, 10 Feb 2017 14:15:55 -0600
+
 iproute2 (4.9.0-1) unstable; urgency=medium
 
   * New upstream release, tested by Julian Wollrath.
@@ -432,6 +790,34 @@ iproute2 (4.6.0-1) unstable; urgency=med
 
  -- Andreas Henriksson <andreas@fatal.se>  Sat, 09 Jul 2016 13:17:22 +0200
 
+iproute2 (4.3.0-1ubuntu3) xenial; urgency=medium
+
+  * Add d/p/1003-fix-variable-in-libnetlink.patch (LP: #1522371), fix a variable name
+    collision issuing a segfault; from upstream.
+  * Add TIPC support (LP: #1508225):
+    - d/control: add libmnl-dev to BDs, to include TIPC support.
+    - d/iproute2.install: add tipc binary.
+
+ -- Pierre-AndrÃ© MOREY <pierre-andre.morey@canonical.com>  Tue, 05 Apr 2016 09:43:44 +0200
+
+iproute2 (4.3.0-1ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for new iptables.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 21 Feb 2016 20:00:55 +0100
+
+iproute2 (4.3.0-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+   - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+     Ubuntu FAN driver support VXLAN V4.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Tue, 22 Dec 2015 09:32:32 +0000
+
 iproute2 (4.3.0-1) unstable; urgency=medium
 
   * Add debian/gbp.conf
@@ -443,6 +829,23 @@ iproute2 (4.3.0-1) unstable; urgency=med
 
  -- Andreas Henriksson <andreas@fatal.se>  Thu, 26 Nov 2015 18:34:59 +0100
 
+iproute2 (4.1.1-1ubuntu2) xenial; urgency=low
+
+  * debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+    Ubuntu FAN drvier support VXLAN V4.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Tue, 17 Nov 2015 13:29:03 +0000
+
+iproute2 (4.1.1-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian, remaining changes (LP: #1448800):
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Wed, 19 Aug 2015 09:59:35 +0100
+
 iproute2 (4.1.1-1) unstable; urgency=medium
 
   * [be9f298] Imported Upstream version 4.1.1
@@ -459,6 +862,18 @@ iproute2 (4.0.0-1) unstable; urgency=med
 
  -- Alexander Wirt <formorer@debian.org>  Wed, 24 Jun 2015 10:01:45 +0200
 
+iproute2 (3.16.0-2ubuntu2) wily; urgency=low
+
+  * Update Ubuntu FAN support to V3.  (LP: #1470091)
+
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 29 Jun 2015 16:59:24 +0100
+
+iproute2 (3.16.0-2ubuntu1) vivid; urgency=low
+
+  * Add Ubuntu FAN support.  (LP: #1439706)
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Tue, 24 Feb 2015 14:45:19 +0000
+
 iproute2 (3.16.0-2) unstable; urgency=medium
 
   * Cherry-pick upstream commit f1b66ff8
@@ -1581,3 +1996,4 @@ iproute (961225-1) unstable; urgency=low
 Local variables:
 mode: debian-changelog
 End:
+
diff -pruN 5.15.0-1/debian/control 5.15.0-1ubuntu2/debian/control
--- 5.15.0-1/debian/control	2021-11-05 23:08:14.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/control	2021-11-29 15:19:02.000000000 +0000
@@ -1,7 +1,8 @@
 Source: iproute2
 Section: net
 Priority: optional
-Maintainer: Alexander Wirt <formorer@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alexander Wirt <formorer@debian.org>
 Uploaders: Luca Boccassi <bluca@debian.org>
 Homepage: https://wiki.linuxfoundation.org/networking/iproute2
 Vcs-Browser: https://salsa.debian.org/debian/iproute2
diff -pruN 5.15.0-1/debian/patches/0001-Add-moo-feature.patch 5.15.0-1ubuntu2/debian/patches/0001-Add-moo-feature.patch
--- 5.15.0-1/debian/patches/0001-Add-moo-feature.patch	2021-11-05 23:08:14.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/patches/0001-Add-moo-feature.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-From: Alexander Wirt <formorer@debian.org>
-Date: Mon, 10 Jun 2013 11:47:00 +0200
-Subject: Add moo feature
-
----
- ip/ip.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/ip/ip.c
-+++ b/ip/ip.c
-@@ -86,6 +86,20 @@
- 	return 0;
- }
- 
-+static int do_moo(int argc, char **argv)
-+{
-+	
-+fprintf(stderr,
-+"\n"
-+" _ __ ___   ___   ___\n"
-+"| '_ ` _ \\ / _ \\ / _ \\\n"
-+"| | | | | | (_) | (_) |\n"
-+"|_| |_| |_|\\___/ \\___/\n"
-+"\n\n"
-+"P.S. no real cows were harmed for this moo\n");
-+	exit(1);
-+}
-+                       
- static const struct cmd {
- 	const char *cmd;
- 	int (*func)(int argc, char **argv);
-@@ -123,6 +137,7 @@
- 	{ "mptcp",	do_mptcp },
- 	{ "ioam",	do_ioam6 },
- 	{ "help",	do_help },
-+	{ "moo",	do_moo }, 
- 	{ 0 }
- };
- 
diff -pruN 5.15.0-1/debian/patches/1000-ubuntu-poc-fan-driver.patch 5.15.0-1ubuntu2/debian/patches/1000-ubuntu-poc-fan-driver.patch
--- 5.15.0-1/debian/patches/1000-ubuntu-poc-fan-driver.patch	1970-01-01 00:00:00.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/patches/1000-ubuntu-poc-fan-driver.patch	2021-11-29 15:20:43.000000000 +0000
@@ -0,0 +1,74 @@
+Description: POC fan driver support
+ POC Fan driver support
+Author: Jay Vosburgh <jay.vosburgh@canonical.com>
+
+Index: iproute2-5.15.0/ip/link_iptnl.c
+===================================================================
+--- iproute2-5.15.0.orig/ip/link_iptnl.c
++++ iproute2-5.15.0/ip/link_iptnl.c
+@@ -84,6 +84,7 @@ static int iptunnel_parse_opt(struct lin
+ 	struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
+ 	int len;
+ 	inet_prefix saddr, daddr, ip6rdprefix, ip6rdrelayprefix;
++	inet_prefix underlay;
+ 	__u8 pmtudisc = 1;
+ 	__u8 tos = 0;
+ 	__u16 iflags = 0;
+@@ -99,6 +100,7 @@ static int iptunnel_parse_opt(struct lin
+ 
+ 	inet_prefix_reset(&saddr);
+ 	inet_prefix_reset(&daddr);
++	inet_prefix_reset(&underlay);
+ 
+ 	inet_prefix_reset(&ip6rdprefix);
+ 	inet_prefix_reset(&ip6rdrelayprefix);
+@@ -212,6 +214,9 @@ get_failed:
+ 		} else if (strcmp(*argv, "remote") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&daddr, *argv, AF_INET);
++		} else if (strcmp(*argv, "underlay") == 0) {
++			NEXT_ARG();
++			get_addr(&underlay, *argv, AF_INET);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&saddr, *argv, AF_INET);
+@@ -353,6 +358,10 @@ get_failed:
+ 		}
+ 	}
+ 
++	if (is_addrtype_inet(&underlay))
++		addattr_l(n, 1024, IFLA_IPTUN_FAN_UNDERLAY,
++			  underlay.data, underlay.bytelen);
++
+ 	return 0;
+ }
+ 
+@@ -390,6 +399,14 @@ static void iptunnel_print_opt(struct li
+ 	tnl_print_endpoint("remote", tb[IFLA_IPTUN_REMOTE], AF_INET);
+ 	tnl_print_endpoint("local", tb[IFLA_IPTUN_LOCAL], AF_INET);
+ 
++	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
++		inet_prefix addr;
++
++		if(!get_addr_rta(&addr, tb[IFLA_IPTUN_FAN_UNDERLAY], AF_INET))
++			print_string(PRINT_ANY, "underlay",  "underlay %s ",
++				format_host(AF_INET, addr.bytelen, addr.data));
++	}
++
+ 	if (tb[IFLA_IPTUN_LINK]) {
+ 		__u32 link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 
+Index: iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2-5.15.0.orig/include/uapi/linux/if_tunnel.h
++++ iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+@@ -77,6 +77,9 @@ enum {
+ 	IFLA_IPTUN_ENCAP_DPORT,
+ 	IFLA_IPTUN_COLLECT_METADATA,
+ 	IFLA_IPTUN_FWMARK,
++
++	IFLA_IPTUN_FAN_UNDERLAY = 32,
++
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
diff -pruN 5.15.0-1/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch 5.15.0-1ubuntu2/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
--- 5.15.0-1/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch	1970-01-01 00:00:00.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch	2021-11-29 15:20:43.000000000 +0000
@@ -0,0 +1,134 @@
+Description: Fan driver support v3
+ Fan driver support v3
+Author: Jay Vosburgh <jay.vosburgh@canonical.com>
+Index: iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2-5.15.0.orig/include/uapi/linux/if_tunnel.h
++++ iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+@@ -79,6 +79,7 @@ enum {
+ 	IFLA_IPTUN_FWMARK,
+ 
+ 	IFLA_IPTUN_FAN_UNDERLAY = 32,
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -164,6 +165,21 @@ enum {
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
+ 
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32          underlay;
++	__be32          overlay;
++	__u16           underlay_prefix;
++	__u16           overlay_prefix;
++};
++
+ #define TUNNEL_CSUM		__cpu_to_be16(0x01)
+ #define TUNNEL_ROUTING		__cpu_to_be16(0x02)
+ #define TUNNEL_KEY		__cpu_to_be16(0x04)
+Index: iproute2-5.15.0/ip/link_iptnl.c
+===================================================================
+--- iproute2-5.15.0.orig/ip/link_iptnl.c
++++ iproute2-5.15.0/ip/link_iptnl.c
+@@ -63,6 +63,42 @@ static void iptunnel_print_help(struct l
+ 		"	MARK := { 0x0..0xffffffff }\n",
+ 		lu->id, mode);
+ }
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ip_tunnel_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon)
++			break;
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
+ 
+ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			      struct nlmsghdr *n)
+@@ -217,6 +253,10 @@ get_failed:
+ 		} else if (strcmp(*argv, "underlay") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&underlay, *argv, AF_INET);
++		} else if (strcmp(*argv, "fan-map") == 0) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&saddr, *argv, AF_INET);
+@@ -365,6 +405,28 @@ get_failed:
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ip_tunnel_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	char s2[64];
+@@ -407,6 +469,9 @@ static void iptunnel_print_opt(struct li
+ 				format_host(AF_INET, addr.bytelen, addr.data));
+ 	}
+ 
++	if (tb[IFLA_IPTUN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
++
+ 	if (tb[IFLA_IPTUN_LINK]) {
+ 		__u32 link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 
diff -pruN 5.15.0-1/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch 5.15.0-1ubuntu2/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
--- 5.15.0-1/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch	1970-01-01 00:00:00.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch	2021-11-29 15:20:43.000000000 +0000
@@ -0,0 +1,178 @@
+Description: Fan driver support VXLAN (p4)
+ Fan driver setup support for vxlan interfaces.
+
+Index: iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2-5.15.0.orig/include/uapi/linux/if_tunnel.h
++++ iproute2-5.15.0/include/uapi/linux/if_tunnel.h
+@@ -173,7 +173,7 @@ enum {
+ 
+ #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
+ 
+-struct ip_tunnel_fan_map {
++struct ifla_fan_map {
+ 	__be32          underlay;
+ 	__be32          overlay;
+ 	__u16           underlay_prefix;
+Index: iproute2-5.15.0/ip/iplink_vxlan.c
+===================================================================
+--- iproute2-5.15.0.orig/ip/iplink_vxlan.c
++++ iproute2-5.15.0/ip/iplink_vxlan.c
+@@ -15,7 +15,10 @@
+ #include <net/if.h>
+ #include <linux/ip.h>
+ #include <linux/if_link.h>
++#include <linux/types.h>
+ #include <arpa/inet.h>
++#include <linux/in6.h>
++#include <linux/if_tunnel.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"
+@@ -73,6 +76,45 @@ static void check_duparg(__u64 *attrs, i
+ 	duparg2(key, argv);
+ }
+ 
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ifla_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon) {
++			PREV_ARG();
++			break;
++		}
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
++
+ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			  struct nlmsghdr *n)
+ {
+@@ -330,6 +372,11 @@ static int vxlan_parse_opt(struct link_u
+ 		} else if (!matches(*argv, "gpe")) {
+ 			check_duparg(&attrs, IFLA_VXLAN_GPE, *argv, *argv);
+ 			addattr_l(n, 1024, IFLA_VXLAN_GPE, NULL, 0);
++		} else if (!matches(*argv, "fan-map")) {
++			check_duparg(&attrs, IFLA_VXLAN_FAN_MAP, *argv, *argv);
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (matches(*argv, "help") == 0) {
+ 			explain();
+ 			return -1;
+@@ -406,6 +453,28 @@ static int vxlan_parse_opt(struct link_u
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ifla_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	__u8 ttl = 0;
+@@ -462,6 +531,9 @@ static void vxlan_print_opt(struct link_
+ 		}
+ 	}
+ 
++	if (tb[IFLA_VXLAN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);
++
+ 	if (tb[IFLA_VXLAN_LOCAL]) {
+ 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
+ 
+Index: iproute2-5.15.0/ip/link_iptnl.c
+===================================================================
+--- iproute2-5.15.0.orig/ip/link_iptnl.c
++++ iproute2-5.15.0/ip/link_iptnl.c
+@@ -63,10 +63,11 @@ static void iptunnel_print_help(struct l
+ 		"	MARK := { 0x0..0xffffffff }\n",
+ 		lu->id, mode);
+ }
++
+ static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
+ {
+ 	inet_prefix underlay, overlay;
+-	struct ip_tunnel_fan_map map;
++	struct ifla_fan_map map;
+ 	struct rtattr *nest;
+ 	char **argv = *argvp;
+ 	int argc = *argcp;
+@@ -75,8 +76,10 @@ static int fan_parse_map(int *argcp, cha
+ 	while (argc > 0) {
+ 		char *colon = strchr(*argv, ':');
+ 
+-		if (!colon)
++		if (!colon) {
++			PREV_ARG();
+ 			break;
++		}
+ 		*colon = '\0';
+ 
+ 		if (get_prefix(&overlay, *argv, AF_INET))
+@@ -408,7 +411,7 @@ get_failed:
+ static void fan_print_map(FILE *f, struct rtattr *attr)
+ {
+ 	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
+-	struct ip_tunnel_fan_map *m;
++	struct ifla_fan_map *m;
+ 	struct rtattr *i;
+ 	int rem;
+ 	int p;
+Index: iproute2-5.15.0/include/uapi/linux/if_link.h
+===================================================================
+--- iproute2-5.15.0.orig/include/uapi/linux/if_link.h
++++ iproute2-5.15.0/include/uapi/linux/if_link.h
+@@ -741,6 +741,7 @@ enum {
+ 	IFLA_VXLAN_GPE,
+ 	IFLA_VXLAN_TTL_INHERIT,
+ 	IFLA_VXLAN_DF,
++	IFLA_VXLAN_FAN_MAP = 33,
+ 	__IFLA_VXLAN_MAX
+ };
+ #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
diff -pruN 5.15.0-1/debian/patches/series 5.15.0-1ubuntu2/debian/patches/series
--- 5.15.0-1/debian/patches/series	2021-11-05 23:08:14.000000000 +0000
+++ 5.15.0-1ubuntu2/debian/patches/series	2021-11-29 15:20:43.000000000 +0000
@@ -1,2 +1,7 @@
-0001-Add-moo-feature.patch
 0004-sync-iptables-header.patch
+
+
+
+1000-ubuntu-poc-fan-driver.patch
+1001-ubuntu-poc-fan-driver-v3.patch
+1002-ubuntu-poc-fan-driver-vxlan.patch
