diff -Nru mstflint-4.21.0/debian/changelog mstflint-4.21.0/debian/changelog --- mstflint-4.21.0/debian/changelog 2022-11-01 21:34:43.000000000 +0000 +++ mstflint-4.21.0/debian/changelog 2023-11-09 13:16:05.000000000 +0000 @@ -1,3 +1,10 @@ +mstflint (4.21.0-7ubuntu1) jammy; urgency=medium + + * Support Linux 6.5 ABI (LP: #2043098): + - debian/patches/support-linux-6.5-jammy.patch + + -- Andrea Righi Thu, 09 Nov 2023 13:16:05 +0000 + mstflint (4.21.0-7) jammy; urgency=low * Getting build to work in kernel build space. diff -Nru mstflint-4.21.0/debian/control mstflint-4.21.0/debian/control --- mstflint-4.21.0/debian/control 2022-10-02 00:00:00.000000000 +0000 +++ mstflint-4.21.0/debian/control 2023-11-09 13:16:05.000000000 +0000 @@ -1,7 +1,8 @@ Source: mstflint Section: net Priority: optional -Maintainer: NVIDIA MFT Apps team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: NVIDIA MFT Apps team Build-Depends: debhelper (>= 9.0), autotools-dev, bzip2, dkms, dpkg-dev, automake, autoconf, make, g++, zlib1g-dev, libibmad-dev, libssl-dev, libjsoncpp-dev, pkg-config, libtool, debhelper, git Standards-Version: 4.6.1 Homepage: https://www.nvidia.com/networking/ diff -Nru mstflint-4.21.0/debian/patches/series mstflint-4.21.0/debian/patches/series --- mstflint-4.21.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ mstflint-4.21.0/debian/patches/series 2023-11-09 13:15:59.000000000 +0000 @@ -0,0 +1 @@ +support-linux-6.5-jammy.patch diff -Nru mstflint-4.21.0/debian/patches/support-linux-6.5-jammy.patch mstflint-4.21.0/debian/patches/support-linux-6.5-jammy.patch --- mstflint-4.21.0/debian/patches/support-linux-6.5-jammy.patch 1970-01-01 00:00:00.000000000 +0000 +++ mstflint-4.21.0/debian/patches/support-linux-6.5-jammy.patch 2023-11-09 13:15:59.000000000 +0000 @@ -0,0 +1,28 @@ +From: Andrea Righi +Subject: support linux 6.5 ABI + +diff -urpN mstflint-4.21.0.orig/kernel/mst_main.c mstflint-4.21.0/kernel/mst_main.c +--- mstflint-4.21.0.orig/kernel/mst_main.c 2022-08-19 00:34:40.000000000 +0000 ++++ mstflint-4.21.0/kernel/mst_main.c 2023-11-09 13:13:50.219689470 +0000 +@@ -1601,7 +1601,9 @@ static const struct file_operations mst_ + .unlocked_ioctl = unlocked_ioctl, + .open = mst_open, + .release = mst_release, ++#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE + .owner = THIS_MODULE, ++#endif + }; + + static struct mst_dev_data* mst_device_create(enum dev_type type, struct pci_dev* pdev) +@@ -1651,7 +1653,11 @@ static struct mst_dev_data* mst_device_c + + if (alloc_chrdev_region(&dev->my_dev, 0, 1, dev->name)) + mst_err("failed to allocate chrdev_region\n"); ++#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE + dev->cl = class_create(THIS_MODULE, dev->name); ++#else ++ dev->cl = class_create(dev->name); ++#endif + if (dev->cl == NULL) + { + pr_alert("Class creation failed\n"); diff -Nru mstflint-4.21.0/kernel/mst_main.c mstflint-4.21.0/kernel/mst_main.c --- mstflint-4.21.0/kernel/mst_main.c 2022-08-19 00:34:40.000000000 +0000 +++ mstflint-4.21.0/kernel/mst_main.c 2023-11-09 13:16:02.000000000 +0000 @@ -1601,7 +1601,9 @@ .unlocked_ioctl = unlocked_ioctl, .open = mst_open, .release = mst_release, +#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE .owner = THIS_MODULE, +#endif }; static struct mst_dev_data* mst_device_create(enum dev_type type, struct pci_dev* pdev) @@ -1651,7 +1653,11 @@ if (alloc_chrdev_region(&dev->my_dev, 0, 1, dev->name)) mst_err("failed to allocate chrdev_region\n"); +#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE dev->cl = class_create(THIS_MODULE, dev->name); +#else + dev->cl = class_create(dev->name); +#endif if (dev->cl == NULL) { pr_alert("Class creation failed\n");