release 6.12.20

debian/bin/genpatch-pfkernel

@@ -5,11 +5,12 @@ export GIT_OPTIONAL_LOCKS=0
 
 w=$(git rev-parse --path-format=absolute --show-toplevel) ; : "${w:?}" ; cd "$w"
 
-dst='debian/patches/pf'
+dst='debian/patches/pf-tmp'
 src='../linux-extras'
-branches='amd-pstate amd-rapl cpuidle crypto fixes ksm zstd'
+branches='btrfs cpuidle crypto fixes kbuild pksm xfs zstd'
 
-[ -d "${dst}" ]
+if [ -d "${dst}" ] ; then rm -rf "${dst}" ; fi
+mkdir -p "${dst}"
 
 kver=
 if [ -n "$1" ] ; then

debian/bin/new-release

@@ -29,7 +29,7 @@ ver_path="v${major}.${minor}"
 
 tarball_new="linux_${v}.orig.tar"
 tarball_new_comp="${tarball_new}.xz"
-do_compress() { do_idle xz -1vv "$1" ; }
+do_compress() { do_idle xz -8vv "$1" ; }
 
 while ! [ -s "../${tarball_new_comp}" ] ; do
 

debian/bin/refine-configs

@@ -0,0 +1,96 @@
+#!/bin/sh
+set -ef
+
+export PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1
+
+prj_dir=$(readlink -f "$(dirname "$0")/../..")
+cd "${prj_dir}"
+
+[ -s debian/changelog ]
+dpkg-parsechangelog --show-field Source | grep -Eq '^linux'
+
+ch_ver=$(dpkg-parsechangelog --show-field Version)
+
+v=$1
+[ -n "$v" ] || v=$(echo "${ch_ver}" | sed -E 's/^\d+://;s/-[^-]+$//')
+[ -n "$v" ]
+
+## should be source tree with patches applied
+src_dir=$2
+[ -n "${src_dir}" ] || src_dir="/tmp/linux-$v"
+[ -n "${src_dir}" ]
+[ -d "${src_dir}" ]
+src_dir=$(readlink -f "${src_dir}")
+
+nproc=$(nproc || printf 2)
+case "${nproc}" in
+[0-1] ) nproc=2 ;;
+[2-9] | 1[0-9] ) ;;
+* ) nproc=20 ;;
+esac
+
+rm -rf debian/build/
+make -f debian/rules debian/control
+[ -f debian/rules.gen ]
+
+configs=$(sed -En '\,debian/build/(config\.[^ :]+):$,{s,,\1,p}' debian/rules.gen | sort -uV | tr -s '[:space:]' ' ')
+[ -n "${configs}" ]
+## produce configs
+make -f debian/rules.gen "-j${nproc}" $(printf ' debian/build/%s' ${configs})
+
+## refresh configs
+for c in ${configs} ; do
+	echo "# refreshing $c" >&2
+
+	f="debian/build/$c"
+	cp -f "$f" "${src_dir}/.config"
+	env -C "${src_dir}" make "-j${nproc}" oldconfig
+	cp -f "${src_dir}/.config" "$f"
+done
+
+## remove build-generated options
+find debian/build/ -name 'config.*' -type f -exec \
+  sed -i -E \
+    -e '/CONFIG_BUILD_SALT/d' \
+    -e '/CONFIG_(AS|CC|PAHOLE)_((CAN|HAS)_)/d' \
+    -e '/CONFIG_(AS|BINDGEN|CC|CLANG|GCC|LD|LLD|PAHOLE|RUSTC)_VERSION/d' \
+    -e '/CONFIG_RUSTC_LLVM_VERSION/d' \
+    -e '/CONFIG_AS_(AVX512|GFNI|SHA(1|256)_NI|TPAUSE|VAES|VPCLMULQDQ|WRUSS)/d' \
+    -e '/CONFIG_CC_(IMPLICIT_FALLTHROUGH)/d' \
+    -e '/CONFIG_(CC|GCC10)_NO_ARRAY_BOUNDS/d' \
+    -e '/CONFIG_(CC|GCC)_((|NO_)STRINGOP_OVERFLOW)/d' \
+  {} +
+
+## prepare configs for splitting
+find debian/build/ -name 'config.*' -type f -exec sed -i -En '/CONFIG_/p' {} +
+
+(
+	cd debian/build
+	mkdir -p split-configs
+	cd split-configs
+	"${prj_dir}/../kconfigeditor2/split-common.py" $(printf ' ../%s' ${configs})
+	find ./ -mindepth 1 -maxdepth 1 -type f -exec sed -i -En '/CONFIG_/p' {} +
+
+	cp -f output-common "${prj_dir}/debian/config/config"
+	i=0
+	for c in ${configs} ; do
+		i=$((i+1))
+
+		## config.amd64_none_cloud -> amd64/config.cloud
+		## config.amd64_rt_desktop -> amd64/rt/config.desktop
+		read -r arch featureset flavour <<-EOF
+		$(printf '%s' "${c#config.}" | tr '_' ' ')
+		EOF
+		[ -n "${arch}" ]       || continue
+		[ -n "${featureset}" ] || continue
+		[ -n "${flavour}" ]    || continue
+		case "${featureset}" in
+		none ) o="${arch}/config.${flavour}" ;;
+		* )    o="${arch}/${featureset}/config.${flavour}" ;;
+		esac
+
+		cp -f "output-part-$i" "${prj_dir}/debian/config/$o"
+	done
+)
+
+"${prj_dir}/../kconfigeditor2/process.py" -s "${src_dir}" .

debian/changelog

@@ -1,3 +1,172 @@
+linux (6.12.20-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.20
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 23 Mar 2025 03:14:29 +0300
+
+linux (6.12.19-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.19
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 13 Mar 2025 20:47:49 +0300
+
+linux (6.12.18-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.18
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sat, 08 Mar 2025 06:44:24 +0300
+
+linux (6.12.17-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.17
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 27 Feb 2025 16:35:33 +0300
+
+linux (6.12.16-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.15
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.16
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 21 Feb 2025 17:46:41 +0300
+
+linux (6.12.14-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.14
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 17 Feb 2025 17:43:08 +0300
+
+linux (6.12.13-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.13
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 09 Feb 2025 19:34:35 +0300
+
+linux (6.12.12-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.12
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sun, 02 Feb 2025 13:07:44 +0300
+
+linux (6.12.11-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.11
+  * Compress vmlinux with xz for all flavours.
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Tue, 28 Jan 2025 09:10:17 +0300
+
+linux (6.12.10-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.10
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Sat, 18 Jan 2025 01:39:50 +0300
+
+linux (6.12.9-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.9
+  * Drop "pf/amd-pstate" and "pf/amd-rapl" patchsets.
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 09 Jan 2025 23:12:22 +0300
+
+linux (6.12.8-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.8
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 02 Jan 2025 19:34:34 +0300
+
+linux (6.12.7-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.7
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 27 Dec 2024 16:28:43 +0300
+
+linux (6.12.6-2) sid; urgency=medium
+
+  * Cherry-pick some patches.
+  * Refine/adjust configs.
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 27 Dec 2024 00:47:14 +0300
+
+linux (6.12.6-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.6
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 19 Dec 2024 21:00:52 +0300
+
+linux (6.12.5-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.5
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 16 Dec 2024 06:43:43 +0300
+
+linux (6.12.4-1) sid; urgency=medium
+
+  * Sync with Debian.
+  * New upstream release: https://kernelnewbies.org/Linux_6.12
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.1
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.2
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.3
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.4
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 09 Dec 2024 22:08:34 +0300
+
+linux (6.11.11-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.11
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Thu, 05 Dec 2024 18:41:08 +0300
+
+linux (6.11.10-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.10
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 22 Nov 2024 19:59:35 +0300
+
+linux (6.11.9-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.9
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Mon, 18 Nov 2024 00:21:44 +0300
+
+linux (6.11.8-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.8
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 15 Nov 2024 10:17:08 +0300
+
+linux (6.11.7-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.7
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 08 Nov 2024 22:31:17 +0300
+
+linux (6.11.6-1) sid; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.6
+
+ -- Konstantin Demin <rockdrilla@gmail.com>  Fri, 01 Nov 2024 10:54:09 +0300
+
 linux (6.11.5-1) sid; urgency=medium
 
   * New upstream stable update:

debian/config/amd64/config.cloud

@@ -24,12 +24,10 @@ CONFIG_JAILHOUSE_GUEST=y
 CONFIG_ACRN_GUEST=y
 CONFIG_INTEL_TDX_GUEST=y
 # CONFIG_GART_IOMMU is not set
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 # CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_5LEVEL=y
 # CONFIG_AMD_NUMA is not set
-# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
-CONFIG_NODES_SHIFT=10
 # CONFIG_X86_PMEM_LEGACY is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 ## choice: TSX enable mode
@@ -352,6 +350,11 @@ CONFIG_CXL_BUS=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
 
+##
+## file: drivers/dma/amd/Kconfig
+##
+# CONFIG_AMD_QDMA is not set
+
 ##
 ## file: drivers/dma/dw/Kconfig
 ##
@@ -714,11 +717,6 @@ CONFIG_VIRTIO_IOMMU=y
 ##
 # CONFIG_IOMMUFD is not set
 
-##
-## file: drivers/irqchip/Kconfig
-##
-# CONFIG_LAN966X_OIC is not set
-
 ##
 ## file: drivers/isdn/Kconfig
 ##
@@ -1376,9 +1374,6 @@ CONFIG_BLK_DEV_PMEM=m
 # CONFIG_NVME_HWMON is not set
 # CONFIG_NVME_RDMA is not set
 CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-# CONFIG_NVME_TCP_TLS is not set
-# CONFIG_NVME_HOST_AUTH is not set
 
 ##
 ## file: drivers/nvme/target/Kconfig
@@ -1386,8 +1381,6 @@ CONFIG_NVME_TCP=m
 CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
-CONFIG_NVME_TARGET_TCP=m
-# CONFIG_NVME_TARGET_TCP_TLS is not set
 
 ##
 ## file: drivers/of/Kconfig
@@ -1403,6 +1396,7 @@ CONFIG_NVME_TARGET_TCP=m
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_XEN_PCIDEV_FRONTEND=m
+# CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_HYPERV=m
 
 ##
@@ -1682,6 +1676,7 @@ CONFIG_SCSI_MPI3MR=m
 ##
 # CONFIG_THERMAL_STATISTICS is not set
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 
 ##
@@ -2095,24 +2090,12 @@ CONFIG_PROC_VMCORE=y
 ##
 ## file: init/Kconfig
 ##
-## choice: Kernel compression mode
-# CONFIG_KERNEL_XZ is not set
-CONFIG_KERNEL_LZ4=y
-## end choice
 CONFIG_DEFAULT_HOSTNAME="debian-cloud"
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 # CONFIG_UCLAMP_TASK is not set
 # CONFIG_RT_GROUP_SCHED is not set
 
-##
-## file: kernel/Kconfig.hz
-##
-## choice: Timer frequency
-CONFIG_HZ_100=y
-# CONFIG_HZ_500 is not set
-## end choice
-
 ##
 ## file: kernel/Kconfig.kexec
 ##
@@ -2140,14 +2123,6 @@ CONFIG_PREEMPT_NONE=y
 ##
 # CONFIG_SWIOTLB_DYNAMIC is not set
 
-##
-## file: kernel/module/Kconfig
-##
-## choice: Module compression mode
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_XZ is not set
-## end choice
-
 ##
 ## file: kernel/power/Kconfig
 ##
@@ -2205,6 +2180,7 @@ CONFIG_PANIC_TIMEOUT=5
 # CONFIG_ZSWAP is not set
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 # CONFIG_HWPOISON_INJECT is not set
+# CONFIG_NUMA_EMU is not set
 
 ##
 ## file: mm/Kconfig.debug
@@ -2460,6 +2436,11 @@ CONFIG_HYPERV_VSOCKETS=m
 # CONFIG_LIST_HARDENED is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 
+##
+## file: security/ipe/Kconfig
+##
+CONFIG_IPE_PROP_DM_VERITY_SIGNATURE=y
+
 ##
 ## file: security/keys/Kconfig
 ##
@@ -2487,7 +2468,6 @@ CONFIG_CXL_PORT=y
 CONFIG_FB_IOMEM_HELPERS_DEFERRED=y
 CONFIG_HVC_IRQ=y
 CONFIG_HYPERV_TIMER=y
-CONFIG_HZ=100
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 CONFIG_INFINIBAND_RTRS=m
 CONFIG_INFINIBAND_USER_MEM=y
@@ -2497,8 +2477,6 @@ CONFIG_KEXEC_CORE=y
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_COMPRESS=m
 CONFIG_MFD_CORE=m
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m
 CONFIG_NETFS_SUPPORT=m
@@ -2506,7 +2484,6 @@ CONFIG_NETFS_SUPPORT=m
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_XXL=y
 CONFIG_PCI_XEN=y
-CONFIG_PGTABLE_LEVELS=5
 CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_RATIONAL=m
 CONFIG_SCSI_COMMON=m

debian/config/amd64/config.mobile

@@ -17,9 +17,7 @@ CONFIG_GART_IOMMU=y
 CONFIG_NR_CPUS=64
 CONFIG_X86_MCE_INJECT=m
 CONFIG_X86_16BIT=y
-# CONFIG_X86_5LEVEL is not set
 CONFIG_AMD_NUMA=y
-CONFIG_NUMA_EMU=y
 CONFIG_NODES_SHIFT=6
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -343,6 +341,7 @@ CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIUART_AML=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBCM4377=m
 CONFIG_BT_HCIBPA10X=m
@@ -579,6 +578,11 @@ CONFIG_XILINX_DMA=m
 CONFIG_XILINX_XDMA=m
 CONFIG_XILINX_ZYNQMP_DPDMA=m
 
+##
+## file: drivers/dma/amd/Kconfig
+##
+CONFIG_AMD_QDMA=m
+
 ##
 ## file: drivers/dma/dw/Kconfig
 ##
@@ -654,6 +658,7 @@ CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_INTEL_CHT_WC=m
 CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_LC824206XA=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
@@ -766,6 +771,7 @@ CONFIG_GPIO_PCA9570=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
 CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ADP5585=m
 CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_BD71815=m
 CONFIG_GPIO_BD71828=m
@@ -830,6 +836,7 @@ CONFIG_GPIO_VIRTUSER=m
 ##
 CONFIG_DRM=y
 # CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -1036,6 +1043,7 @@ CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A=m
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+CONFIG_DRM_PANEL_BOE_TV101WUM_LL2=m
 CONFIG_DRM_PANEL_EBBG_FT8719=m
 CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
@@ -1273,6 +1281,7 @@ CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOODIX_SPI=m
 CONFIG_HID_GOOGLE_STADIA_FF=m
 CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
@@ -1718,7 +1727,6 @@ CONFIG_INTEL_TH_PTI=m
 ##
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_ATR=m
@@ -1765,6 +1773,7 @@ CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_ZHAOXIN=m
 CONFIG_I2C_SCMI=m
 CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
@@ -1772,6 +1781,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEBA=m
 CONFIG_I2C_KEMPLD=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
@@ -1805,6 +1815,7 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+CONFIG_I2C_MUX_MULE=m
 
 ##
 ## file: drivers/i3c/Kconfig
@@ -1818,6 +1829,7 @@ CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
 CONFIG_SVC_I3C_MASTER=m
 CONFIG_MIPI_I3C_HCI=m
+CONFIG_MIPI_I3C_HCI_PCI=m
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -1908,7 +1920,6 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_NEWTON=m
 CONFIG_KEYBOARD_OPENCORES=m
@@ -2092,7 +2103,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DA9034 is not set
 # CONFIG_TOUCHSCREEN_DA9052 is not set
@@ -2119,7 +2129,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
@@ -2199,7 +2208,6 @@ CONFIG_IOMMUFD=m
 ## file: drivers/irqchip/Kconfig
 ##
 # CONFIG_AL_FIC is not set
-CONFIG_LAN966X_OIC=m
 # CONFIG_XILINX_INTC is not set
 
 ##
@@ -2292,6 +2300,7 @@ CONFIG_LEDS_MENF21BMC=m
 CONFIG_LEDS_IS31FL319X=m
 CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_BLINKM_MULTICOLOR=y
 CONFIG_LEDS_MLXCPLD=m
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
@@ -2429,6 +2438,11 @@ CONFIG_CEC_CH7322=m
 ##
 CONFIG_CEC_SECO=m
 
+##
+## file: drivers/media/cec/usb/extron-da-hd-4k-plus/Kconfig
+##
+CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC=m
+
 ##
 ## file: drivers/media/cec/usb/pulse8/Kconfig
 ##
@@ -2739,6 +2753,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 ##
 ## file: drivers/mfd/Kconfig
 ##
+CONFIG_MFD_ADP5585=m
 CONFIG_MFD_ACT8945A=m
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_SMPRO=m
@@ -2900,6 +2915,7 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
+CONFIG_RPMB=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
@@ -3281,6 +3297,7 @@ CONFIG_CAN_C_CAN_PCI=m
 ## file: drivers/net/can/cc770/Kconfig
 ##
 CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
 CONFIG_CAN_CC770_PLATFORM=m
 
 ##
@@ -3323,6 +3340,7 @@ CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
 
 ##
@@ -3364,6 +3382,7 @@ CONFIG_DNET=m
 CONFIG_JME=m
 CONFIG_FEALNX=m
 CONFIG_ETHOC=m
+CONFIG_OA_TC6=m
 
 ##
 ## file: drivers/net/ethernet/3com/Kconfig
@@ -3673,6 +3692,7 @@ CONFIG_MLX5_MACSEC=y
 CONFIG_MLX5_EN_IPSEC=y
 CONFIG_MLX5_EN_TLS=y
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_HW_STEERING=y
 CONFIG_MLX5_SF=y
 CONFIG_MLX5_DPLL=m
 
@@ -3715,6 +3735,16 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 
+##
+## file: drivers/net/ethernet/microchip/fdma/Kconfig
+##
+CONFIG_FDMA=y
+
+##
+## file: drivers/net/ethernet/microchip/lan865x/Kconfig
+##
+CONFIG_LAN865X=m
+
 ##
 ## file: drivers/net/ethernet/microchip/lan966x/Kconfig
 ##
@@ -3828,6 +3858,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_RTASE=m
 
 ##
 ## file: drivers/net/ethernet/renesas/Kconfig
@@ -4646,6 +4677,7 @@ CONFIG_RTW89=m
 CONFIG_RTW89_8851BE=m
 CONFIG_RTW89_8852AE=m
 CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852BTE=m
 CONFIG_RTW89_8852CE=m
 CONFIG_RTW89_8922AE=m
 CONFIG_RTW89_DEBUGMSG=y
@@ -4855,14 +4887,11 @@ CONFIG_OF_PMEM=y
 ##
 CONFIG_NVME_HWMON=y
 # CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_HOST_AUTH=y
 
 ##
 ## file: drivers/nvme/target/Kconfig
 ##
 # CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
 
 ##
 ## file: drivers/nvmem/Kconfig
@@ -4876,6 +4905,7 @@ CONFIG_NVMEM_U_BOOT_ENV=m
 ##
 CONFIG_NVMEM_LAYOUT_SL28_VPD=m
 CONFIG_NVMEM_LAYOUT_ONIE_TLV=m
+CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=m
 
 ##
 ## file: drivers/of/Kconfig
@@ -4898,6 +4928,7 @@ CONFIG_PARPORT_1284=y
 ##
 ## file: drivers/pci/Kconfig
 ##
+CONFIG_PCI_P2PDMA=y
 # CONFIG_PCI_DYNAMIC_OF_NODES is not set
 
 ##
@@ -5165,6 +5196,7 @@ CONFIG_SEL3350_PLATFORM=m
 ## file: drivers/platform/x86/amd/Kconfig
 ##
 CONFIG_AMD_HSMP=m
+CONFIG_AMD_3D_VCACHE=m
 CONFIG_AMD_WBRF=y
 
 ##
@@ -5433,6 +5465,7 @@ CONFIG_PTP_1588_CLOCK_OCP=m
 ##
 CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ADP5585=m
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
 CONFIG_PWM_ATMEL_TCB=m
 CONFIG_PWM_CLK=m
@@ -5729,6 +5762,7 @@ CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV3032=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_SD2405AL=m
 CONFIG_RTC_DRV_SD3078=m
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
@@ -5964,11 +5998,6 @@ CONFIG_GREYBUS_SPI=m
 CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
 
-##
-## file: drivers/staging/ks7010/Kconfig
-##
-CONFIG_KS7010=m
-
 ##
 ## file: drivers/staging/media/Kconfig
 ##
@@ -6075,6 +6104,7 @@ CONFIG_REMOTE_TARGET=m
 ##
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_DEBUGFS=y
+CONFIG_THERMAL_CORE_TESTING=m
 CONFIG_THERMAL_OF=y
 ## choice: Default Thermal governor
 # CONFIG_THERMAL_DEFAULT_GOV_BANG_BANG is not set
@@ -6456,6 +6486,7 @@ CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_CHAOSKEY=m
 CONFIG_USB_ONBOARD_DEV=m
+CONFIG_USB_ONBOARD_DEV_USB5744=y
 
 ##
 ## file: drivers/usb/misc/sisusbvga/Kconfig
@@ -7154,6 +7185,7 @@ CONFIG_CIFS_DEBUG=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 
 ##
 ## file: fs/sysv/Kconfig
@@ -7193,10 +7225,6 @@ CONFIG_XFS_SUPPORT_V4=y
 ##
 ## file: init/Kconfig
 ##
-## choice: Kernel compression mode
-CONFIG_KERNEL_XZ=y
-# CONFIG_KERNEL_LZ4 is not set
-## end choice
 CONFIG_DEFAULT_HOSTNAME="debian-mobile"
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
@@ -7205,14 +7233,6 @@ CONFIG_UCLAMP_BUCKETS_COUNT=10
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_UCLAMP_TASK_GROUP=y
 
-##
-## file: kernel/Kconfig.hz
-##
-## choice: Timer frequency
-CONFIG_HZ_100=y
-# CONFIG_HZ_500 is not set
-## end choice
-
 ##
 ## file: kernel/Kconfig.kexec
 ##
@@ -7234,15 +7254,6 @@ CONFIG_SCHED_CORE=y
 CONFIG_SWIOTLB_DYNAMIC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 
-##
-## file: kernel/module/Kconfig
-##
-## choice: Module compression mode
-# CONFIG_MODULE_COMPRESS_NONE is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-## end choice
-# CONFIG_MODULE_DECOMPRESS is not set
-
 ##
 ## file: kernel/power/Kconfig
 ##
@@ -7311,6 +7322,7 @@ CONFIG_TEST_DHRY=m
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
@@ -7385,6 +7397,7 @@ CONFIG_ZBUD=y
 CONFIG_Z3FOLD_DEPRECATED=m
 # CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_HWPOISON_INJECT=m
+CONFIG_NUMA_EMU=y
 
 ##
 ## file: mm/Kconfig.debug
@@ -7437,6 +7450,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_USBG=y
 # CONFIG_NET_9P_DEBUG is not set
 
 ##
@@ -7485,11 +7499,6 @@ CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 
-##
-## file: net/bluetooth/cmtp/Kconfig
-##
-CONFIG_BT_CMTP=m
-
 ##
 ## file: net/bluetooth/hidp/Kconfig
 ##
@@ -7782,6 +7791,12 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_INTEGRITY_MACHINE_KEYRING=y
 # CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set
 
+##
+## file: security/ipe/Kconfig
+##
+CONFIG_IPE_POLICY_SIG_SECONDARY_KEYRING=y
+CONFIG_IPE_POLICY_SIG_PLATFORM_KEYRING=y
+
 ##
 ## file: security/keys/Kconfig
 ##
@@ -7817,10 +7832,10 @@ CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_CTL_INPUT_VALIDATION=y
+CONFIG_SND_UTIMER=y
 
 ##
 ## file: sound/core/seq/Kconfig
@@ -8018,6 +8033,7 @@ CONFIG_SND_AMD_ASOC_ACP63=m
 CONFIG_SND_AMD_ASOC_ACP70=m
 CONFIG_SND_SOC_AMD_LEGACY_MACH=m
 CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_SOC_AMD_SOF_SDW_MACH=m
 
 ##
 ## file: sound/soc/atmel/Kconfig
@@ -8243,6 +8259,7 @@ CONFIG_SND_SOC_WSA884X=m
 CONFIG_SND_SOC_ZL38060=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6357=m
 CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_MT6660=m
 CONFIG_SND_SOC_NAU8315=m
@@ -8316,16 +8333,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 CONFIG_SND_SOC_INTEL_CATPT=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-CONFIG_SND_SOC_INTEL_CML_H=m
-CONFIG_SND_SOC_INTEL_CML_LP=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_AVS=m
 
 ##
@@ -8369,17 +8376,7 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
@@ -8418,6 +8415,7 @@ CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
 CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
 CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_AMD_ACP63=m
+CONFIG_SND_SOC_SOF_AMD_ACP70=m
 
 ##
 ## file: sound/soc/sof/intel/Kconfig
@@ -8440,6 +8438,7 @@ CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 CONFIG_SND_SOC_SOF_LUNARLAKE=m
+CONFIG_SND_SOC_SOF_PANTHERLAKE=m
 CONFIG_SND_SOC_SOF_HDA_LINK=y
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
@@ -8504,6 +8503,7 @@ CONFIG_AC97_BUS=m
 CONFIG_ACPI_ADXL=y
 CONFIG_ACPI_NHLT=y
 CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_AMD_ATL_PRM=y
 CONFIG_ASN1_ENCODER=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_PQ=m
@@ -8550,7 +8550,6 @@ CONFIG_BT_MTK=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RTL=m
 CONFIG_CAN_RX_OFFLOAD=y
-CONFIG_CAPI_TRACE=y
 CONFIG_CARL9170_WPC=y
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_CEC_CORE=m
@@ -8580,6 +8579,8 @@ CONFIG_DRM_AUX_BRIDGE=m
 CONFIG_DRM_AUX_HPD_BRIDGE=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_BUDDY=m
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_DP_TUNNEL=y
@@ -8605,6 +8606,7 @@ CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DTC=y
 CONFIG_FB_BACKLIGHT=m
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FUN_CORE=m
 CONFIG_FW_ATTR_CLASS=m
 CONFIG_FW_CS_DSP=m
@@ -8631,10 +8633,8 @@ CONFIG_HID_VIVALDI_COMMON=m
 CONFIG_HSI_BOARDINFO=y
 CONFIG_HSU_DMA=y
 CONFIG_HWMON_VID=m
-CONFIG_HZ=100
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CCGX_UCSI=m
-CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_HID_CORE=m
 CONFIG_I2C_I801_MUX=y
 CONFIG_IGC_LEDS=y
@@ -8658,7 +8658,6 @@ CONFIG_IRQCHIP=y
 CONFIG_IRQ_SIM=y
 CONFIG_ISA_BUS_API=y
 CONFIG_ISDN_CAPI=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_IWLEGACY=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
@@ -8748,7 +8747,6 @@ CONFIG_NFC_ST_NCI=m
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NLS_UCS2_UTILS=m
 CONFIG_NVMEM_LAYOUTS=y
-CONFIG_NVME_AUTH=m
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
@@ -8761,6 +8759,7 @@ CONFIG_OF_MDIO=m
 CONFIG_OF_NUMA=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
+CONFIG_OPEN_ALLIANCE_HELPERS=y
 CONFIG_P54_LEDS=y
 CONFIG_PAGE_IDLE_FLAG=y
 CONFIG_PARPORT_NOT_PC=y
@@ -8775,7 +8774,6 @@ CONFIG_PCIE_PLDA_HOST=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCS_LYNX=m
-CONFIG_PGTABLE_LEVELS=4
 CONFIG_PHYLIB_LEDS=y
 CONFIG_PINCTRL_CS47L15=y
 CONFIG_PINCTRL_CS47L35=y
@@ -8859,6 +8857,7 @@ CONFIG_RTW88_USB=m
 CONFIG_RTW89_8851B=m
 CONFIG_RTW89_8852A=m
 CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852BT=m
 CONFIG_RTW89_8852B_COMMON=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8922A=m
@@ -8923,6 +8922,7 @@ CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ACPI_AMD_MATCH=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_ADAU1372=m
 CONFIG_SND_SOC_ADAU1761=m
@@ -8955,20 +8955,14 @@ CONFIG_SND_SOC_ES83XX_DSM_COMMON=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_HDAC_HDA=m
-CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
 CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m
 CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m
 CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m
 CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m
-CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
 CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_NAU8825=m
@@ -8989,7 +8983,6 @@ CONFIG_SND_SOC_RT274=m
 CONFIG_SND_SOC_RT286=m
 CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5651=m
 CONFIG_SND_SOC_RT5660=m
@@ -9003,6 +8996,7 @@ CONFIG_SND_SOC_RT5682_I2C=m
 CONFIG_SND_SOC_RT700=m
 CONFIG_SND_SOC_RT711=m
 CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_SDW_UTILS=m
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
 CONFIG_SND_SOC_SIGMADSP_REGMAP=m
@@ -9027,6 +9021,7 @@ CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
 CONFIG_SND_SOC_SOF_INTEL_ICL=m
 CONFIG_SND_SOC_SOF_INTEL_LNL=m
 CONFIG_SND_SOC_SOF_INTEL_MTL=m
+CONFIG_SND_SOC_SOF_INTEL_PTL=m
 CONFIG_SND_SOC_SOF_INTEL_SKL=m
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
 CONFIG_SND_SOC_SOF_INTEL_TGL=m

debian/config/amd64/config.vm

@@ -28,12 +28,10 @@ CONFIG_JAILHOUSE_GUEST=y
 CONFIG_ACRN_GUEST=y
 CONFIG_INTEL_TDX_GUEST=y
 # CONFIG_GART_IOMMU is not set
-CONFIG_NR_CPUS=16
+CONFIG_NR_CPUS=256
 # CONFIG_X86_MCE_INJECT is not set
-# CONFIG_X86_5LEVEL is not set
 CONFIG_AMD_NUMA=y
-CONFIG_NUMA_EMU=y
+CONFIG_NODES_SHIFT=8
-CONFIG_NODES_SHIFT=6
 # CONFIG_X86_PMEM_LEGACY is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 ## choice: TSX enable mode
@@ -409,6 +407,11 @@ CONFIG_PM_DEVFREQ_EVENT=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
 
+##
+## file: drivers/dma/amd/Kconfig
+##
+# CONFIG_AMD_QDMA is not set
+
 ##
 ## file: drivers/dma/dw/Kconfig
 ##
@@ -480,6 +483,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_INTEL_INT3496 is not set
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
@@ -568,6 +572,7 @@ CONFIG_GPIO_SIM=m
 ##
 CONFIG_DRM=y
 # CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -1104,7 +1109,6 @@ CONFIG_SENSORS_PMBUS=m
 ##
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -1147,8 +1151,7 @@ CONFIG_I2C_PIIX4=m
 CONFIG_I2C_ZHAOXIN=m
 CONFIG_I2C_SCMI=m
 # CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_CORE is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
@@ -1332,7 +1335,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -1458,7 +1460,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@@ -1481,7 +1482,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
@@ -1548,11 +1548,6 @@ CONFIG_VIRTIO_IOMMU=y
 ##
 # CONFIG_IOMMUFD is not set
 
-##
-## file: drivers/irqchip/Kconfig
-##
-# CONFIG_LAN966X_OIC is not set
-
 ##
 ## file: drivers/isdn/Kconfig
 ##
@@ -2350,9 +2345,6 @@ CONFIG_BLK_DEV_PMEM=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
-CONFIG_NVME_TCP=m
-# CONFIG_NVME_TCP_TLS is not set
-# CONFIG_NVME_HOST_AUTH is not set
 
 ##
 ## file: drivers/nvme/target/Kconfig
@@ -2360,8 +2352,6 @@ CONFIG_NVME_TCP=m
 CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
-CONFIG_NVME_TARGET_TCP=m
-# CONFIG_NVME_TARGET_TCP_TLS is not set
 
 ##
 ## file: drivers/of/Kconfig
@@ -2377,6 +2367,7 @@ CONFIG_NVME_TARGET_TCP=m
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_XEN_PCIDEV_FRONTEND=m
+# CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_HYPERV=m
 
 ##
@@ -2489,6 +2480,7 @@ CONFIG_MSI_WMI_PLATFORM=m
 # CONFIG_TOSHIBA_WMI is not set
 # CONFIG_ACPI_CMPC is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
+CONFIG_SERIAL_MULTI_INSTANTIATE=m
 # CONFIG_MLX_PLATFORM is not set
 # CONFIG_INSPUR_PLATFORM_PROFILE is not set
 # CONFIG_LENOVO_WMI_CAMERA is not set
@@ -2501,6 +2493,7 @@ CONFIG_MSI_WMI_PLATFORM=m
 ## file: drivers/platform/x86/amd/Kconfig
 ##
 # CONFIG_AMD_HSMP is not set
+# CONFIG_AMD_3D_VCACHE is not set
 # CONFIG_AMD_WBRF is not set
 
 ##
@@ -2706,6 +2699,7 @@ CONFIG_RTC_DRV_MAX31335=m
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD2405AL is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
 # CONFIG_RTC_DRV_PCF2127 is not set
@@ -2859,6 +2853,7 @@ CONFIG_REMOTE_TARGET=m
 ##
 # CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_DEBUGFS=y
+# CONFIG_THERMAL_CORE_TESTING is not set
 # CONFIG_THERMAL_HWMON is not set
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 CONFIG_DEVFREQ_THERMAL=y
@@ -3177,7 +3172,6 @@ CONFIG_SNET_VDPA=m
 CONFIG_FB_CIRRUS=m
 CONFIG_FB_UVESA=m
 # CONFIG_FB_VIA is not set
-# CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
 CONFIG_FB_GOLDFISH=m
@@ -3534,6 +3528,7 @@ CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 
 ##
 ## file: fs/sysv/Kconfig
@@ -3558,24 +3553,12 @@ CONFIG_VBOXSF_FS=m
 ##
 ## file: init/Kconfig
 ##
-## choice: Kernel compression mode
-CONFIG_KERNEL_XZ=y
-# CONFIG_KERNEL_LZ4 is not set
-## end choice
 CONFIG_DEFAULT_HOSTNAME="debian-vm"
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 # CONFIG_UCLAMP_TASK is not set
 # CONFIG_RT_GROUP_SCHED is not set
 
-##
-## file: kernel/Kconfig.hz
-##
-## choice: Timer frequency
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_500=y
-## end choice
-
 ##
 ## file: kernel/Kconfig.kexec
 ##
@@ -3596,15 +3579,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
 ##
 # CONFIG_SWIOTLB_DYNAMIC is not set
 
-##
-## file: kernel/module/Kconfig
-##
-## choice: Module compression mode
-# CONFIG_MODULE_COMPRESS_NONE is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-## end choice
-# CONFIG_MODULE_DECOMPRESS is not set
-
 ##
 ## file: kernel/power/Kconfig
 ##
@@ -3700,6 +3674,7 @@ CONFIG_ZBUD=y
 CONFIG_Z3FOLD_DEPRECATED=m
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 # CONFIG_HWPOISON_INJECT is not set
+CONFIG_NUMA_EMU=y
 
 ##
 ## file: mm/Kconfig.debug
@@ -4008,6 +3983,11 @@ CONFIG_HYPERV_VSOCKETS=m
 # CONFIG_LIST_HARDENED is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 
+##
+## file: security/ipe/Kconfig
+##
+CONFIG_IPE_PROP_DM_VERITY_SIGNATURE=y
+
 ##
 ## file: security/keys/Kconfig
 ##
@@ -4054,7 +4034,6 @@ CONFIG_HDMI=y
 CONFIG_HSI_BOARDINFO=y
 CONFIG_HVC_IRQ=y
 CONFIG_HYPERV_TIMER=y
-CONFIG_HZ=500
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_HID_CORE=m
 CONFIG_I2C_I801_MUX=y
@@ -4071,8 +4050,6 @@ CONFIG_LZ4_COMPRESS=m
 CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_MCTP_FLOWS=y
 CONFIG_MFD_CORE=m
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_ND_BTT=m
 CONFIG_ND_PFN=m
@@ -4083,7 +4060,6 @@ CONFIG_NLS_UCS2_UTILS=m
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_XXL=y
 CONFIG_PCI_XEN=y
-CONFIG_PGTABLE_LEVELS=4
 CONFIG_PM_CLK=y
 CONFIG_PM_OPP=y
 CONFIG_PM_SLEEP_DEBUG=y

debian/config/config

@@ -50,6 +50,7 @@ CONFIG_X86_VSYSCALL_EMULATION=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
 # CONFIG_X86_CPA_STATISTICS is not set
 CONFIG_AMD_MEM_ENCRYPT=y
 CONFIG_NUMA=y
@@ -79,7 +80,6 @@ CONFIG_RANDOMIZE_BASE=y
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
-# CONFIG_ADDRESS_MASKING is not set
 # CONFIG_COMPAT_VDSO is not set
 ## choice: vsyscall table for legacy applications
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set
@@ -93,9 +93,17 @@ CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
 # CONFIG_MITIGATION_IBPB_ENTRY is not set
 # CONFIG_MITIGATION_IBRS_ENTRY is not set
 # CONFIG_MITIGATION_SLS is not set
-# CONFIG_MITIGATION_GDS_FORCE is not set
+# CONFIG_MITIGATION_GDS is not set
 # CONFIG_MITIGATION_RFDS is not set
 # CONFIG_MITIGATION_SPECTRE_BHI is not set
+# CONFIG_MITIGATION_MDS is not set
+# CONFIG_MITIGATION_TAA is not set
+# CONFIG_MITIGATION_MMIO_STALE_DATA is not set
+# CONFIG_MITIGATION_L1TF is not set
+# CONFIG_MITIGATION_SPECTRE_V1 is not set
+# CONFIG_MITIGATION_SPECTRE_V2 is not set
+# CONFIG_MITIGATION_SRBDS is not set
+# CONFIG_MITIGATION_SSB is not set
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_ISA_BUS is not set
@@ -532,12 +540,19 @@ CONFIG_BLK_DEV_NULL_BLK=m
 ## file: drivers/block/zram/Kconfig
 ##
 CONFIG_ZRAM=m
+CONFIG_ZRAM_BACKEND_LZ4=y
+CONFIG_ZRAM_BACKEND_LZ4HC=y
+CONFIG_ZRAM_BACKEND_ZSTD=y
+CONFIG_ZRAM_BACKEND_DEFLATE=y
+CONFIG_ZRAM_BACKEND_842=y
+CONFIG_ZRAM_BACKEND_LZO=y
 ## choice: Default zram compressor
 # CONFIG_ZRAM_DEF_COMP_LZORLE is not set
-CONFIG_ZRAM_DEF_COMP_ZSTD=y
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+# CONFIG_ZRAM_DEF_COMP_DEFLATE is not set
 # CONFIG_ZRAM_DEF_COMP_842 is not set
 ## end choice
 CONFIG_ZRAM_WRITEBACK=y
@@ -848,6 +863,7 @@ CONFIG_PCC=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 # CONFIG_MD_BITMAP_FILE is not set
+CONFIG_MD_LINEAR=m
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
@@ -1083,6 +1099,9 @@ CONFIG_NVDIMM_DAX=y
 CONFIG_BLK_DEV_NVME=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_VERBOSE_ERRORS=y
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TCP_TLS=y
+CONFIG_NVME_HOST_AUTH=y
 
 ##
 ## file: drivers/nvme/target/Kconfig
@@ -1091,7 +1110,9 @@ CONFIG_NVME_TARGET=m
 # CONFIG_NVME_TARGET_DEBUGFS is not set
 CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_AUTH is not set
+CONFIG_NVME_TARGET_TCP=m
+CONFIG_NVME_TARGET_TCP_TLS=y
+CONFIG_NVME_TARGET_AUTH=y
 
 ##
 ## file: drivers/nvmem/Kconfig
@@ -1113,7 +1134,6 @@ CONFIG_PCI_PF_STUB=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
-# CONFIG_PCI_P2PDMA is not set
 ## choice: PCI Express hierarchy optimization setting
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
 CONFIG_PCIE_BUS_DEFAULT=y
@@ -1162,11 +1182,6 @@ CONFIG_PCIE_PTM=y
 ##
 # CONFIG_CHROME_PLATFORMS is not set
 
-##
-## file: drivers/platform/cznic/Kconfig
-##
-# CONFIG_CZNIC_PLATFORMS is not set
-
 ##
 ## file: drivers/platform/mellanox/Kconfig
 ##
@@ -1567,6 +1582,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
@@ -1668,6 +1684,7 @@ CONFIG_HUGETLBFS=y
 # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NFS_LOCALIO is not set
 
 ##
 ## file: fs/Kconfig.binfmt
@@ -1732,6 +1749,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 CONFIG_EROFS_FS_ZIP=y
 CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EROFS_FS_ZIP_DEFLATE=y
@@ -1985,7 +2003,9 @@ CONFIG_LOCALVERSION=""
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_ZSTD is not set
 ## end choice
 CONFIG_DEFAULT_INIT=""
@@ -2026,6 +2046,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -2092,8 +2113,10 @@ CONFIG_PROFILING=y
 ## file: kernel/Kconfig.hz
 ##
 ## choice: Timer frequency
+CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
 # CONFIG_HZ_1000 is not set
 ## end choice
 
@@ -2102,8 +2125,10 @@ CONFIG_PROFILING=y
 ##
 ## choice: Preemption Model
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_RT is not set
 ## end choice
 # CONFIG_PREEMPT_DYNAMIC is not set
+CONFIG_SCHED_CLASS_EXT=y
 
 ##
 ## file: kernel/bpf/Kconfig
@@ -2150,7 +2175,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_MODULE_SIG_ALL=y
-## choice: Which hash algorithm should modules be signed with?
+## choice: Hash algorithm to sign modules
 # CONFIG_MODULE_SIG_SHA1 is not set
 CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_SHA384 is not set
@@ -2159,10 +2184,14 @@ CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_SHA3_384 is not set
 # CONFIG_MODULE_SIG_SHA3_512 is not set
 ## end choice
-## choice: Module compression mode
+CONFIG_MODULE_COMPRESS=y
+## choice: Module compression type
 # CONFIG_MODULE_COMPRESS_GZIP is not set
+CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
 ## end choice
+CONFIG_MODULE_COMPRESS_ALL=y
+CONFIG_MODULE_DECOMPRESS=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -2326,6 +2355,7 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_VMLINUX_MAP=y
+CONFIG_BUILTIN_MODULE_RANGES=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -2361,7 +2391,6 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_TEST_LOCKUP is not set
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
-CONFIG_DEBUG_TIMEKEEPING=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -2458,7 +2487,9 @@ CONFIG_XZ_DEC_X86=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_ARM is not set
 # CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_ARM64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_RISCV is not set
 CONFIG_XZ_DEC_MICROLZMA=y
 # CONFIG_XZ_DEC_TEST is not set
 
@@ -3153,7 +3184,7 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 ## end choice
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf"
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf,ipe"
 
 ##
 ## file: security/Kconfig.hardening
@@ -3196,6 +3227,15 @@ CONFIG_EVM_ATTR_FSUUID=y
 ##
 # CONFIG_IMA is not set
 
+##
+## file: security/ipe/Kconfig
+##
+CONFIG_SECURITY_IPE=y
+CONFIG_IPE_BOOT_POLICY=""
+CONFIG_IPE_PROP_DM_VERITY=y
+CONFIG_IPE_PROP_FS_VERITY=y
+CONFIG_IPE_PROP_FS_VERITY_BUILTIN_SIG=y
+
 ##
 ## file: security/keys/Kconfig
 ##
@@ -3290,6 +3330,7 @@ CONFIG_APERTURE_HELPERS=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -3310,6 +3351,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 CONFIG_ARCH_HAS_DEBUG_WX=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -3339,6 +3381,7 @@ CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UBSAN=y
 CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ARCH_HAVE_EXTRA_ELF_NOTES=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -3351,6 +3394,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=32
 CONFIG_ARCH_MMAP_RND_BITS_MIN=28
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_PKEY_BITS=4
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -3361,6 +3405,7 @@ CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
 CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_ARCH_SUPPORTS_KEXEC=y
 CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y
@@ -3376,10 +3421,13 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PUD_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
@@ -3405,17 +3453,7 @@ CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_XOR=m
-CONFIG_AS_AVX512=y
-CONFIG_AS_GFNI=y
-CONFIG_AS_HAS_NON_CONST_ULEB128=y
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_SHA1_NI=y
-CONFIG_AS_SHA256_NI=y
-CONFIG_AS_TPAUSE=y
-CONFIG_AS_VAES=y
-CONFIG_AS_VERSION=24301
-CONFIG_AS_VPCLMULQDQ=y
-CONFIG_AS_WRUSS=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_AUXILIARY_BUS=y
@@ -3439,39 +3477,11 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
-CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_ENTRY_PADDING=y
-CONFIG_CC_HAS_IBT=y
-CONFIG_CC_HAS_INT128=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_KASAN_SW_TAGS=y
-CONFIG_CC_HAS_NAMED_AS=y
-CONFIG_CC_HAS_NAMED_AS_FIXED_SANITIZERS=y
-CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_CC_HAS_RETURN_THUNK=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-CONFIG_CC_HAS_SLS=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_CC_IS_GCC=y
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CC_NO_STRINGOP_OVERFLOW=y
-CONFIG_CC_VERSION_TEXT="gcc (Debian 14.2.0-7) 14.2.0"
 CONFIG_CDROM=m
 CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CLANG_VERSION=0
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKEVT_I8253=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLZ_TAB=y
 CONFIG_COMPACT_UNEVICTABLE_DEFAULT=0
@@ -3562,7 +3572,7 @@ CONFIG_DMA_ACPI=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_NEED_SYNC=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_DM_BIO_PRISON=m
@@ -3591,6 +3601,7 @@ CONFIG_EVENT_TRACING=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_EXECMEM=y
 CONFIG_EXPORTFS=y
+CONFIG_EXT_GROUP_SCHED=y
 CONFIG_FAT_FS=m
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
@@ -3629,9 +3640,6 @@ CONFIG_FUTEX_PI=y
 CONFIG_FWNODE_MDIO=m
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
-CONFIG_GCC_VERSION=140200
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
@@ -3672,6 +3680,7 @@ CONFIG_GET_FREE_REGION=y
 CONFIG_GLOB=y
 CONFIG_GOOGLE_MEMCONSOLE=m
 CONFIG_GRACE_PERIOD=m
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_GRO_CELLS=y
 CONFIG_GUEST_PERF_EVENTS=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -3820,7 +3829,6 @@ CONFIG_HAVE_UID16=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION_DEF_COMP="lzo"
 CONFIG_HMEM_REPORTING=y
@@ -3835,7 +3843,9 @@ CONFIG_HOTPLUG_SPLIT_STARTUP=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_HVC_DRIVER=y
+CONFIG_HZ=100
 CONFIG_IA32_FEAT_CTL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
@@ -3903,14 +3913,13 @@ CONFIG_KVM_GENERIC_PRIVATE_MEM=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_PRIVATE_MEM=y
 CONFIG_KVM_VFIO=y
+CONFIG_KVM_X86=m
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
-CONFIG_LD_VERSION=24301
 CONFIG_LEGACY_DIRECT_IO=y
 CONFIG_LLC=m
-CONFIG_LLD_VERSION=0
 CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
@@ -3934,6 +3943,8 @@ CONFIG_MLX4_CORE=m
 CONFIG_MMCONF_FAM10H=y
 CONFIG_MMU=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -3958,6 +3969,7 @@ CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NETPOLL=y
 CONFIG_NET_DEVLINK=y
+CONFIG_NET_DEVMEM=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_HANDSHAKE=y
 CONFIG_NET_INGRESS=y
@@ -3968,7 +3980,7 @@ CONFIG_NET_REDIRECT=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_SCH_MQPRIO_LIB=m
-# CONFIG_NET_SELFTESTS is not set
+CONFIG_NET_SELFTESTS=m
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_XGRESS=y
@@ -4005,9 +4017,12 @@ CONFIG_NR_CPUS_DEFAULT=64
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_NUMA_MEMBLKS=y
 CONFIG_NVDIMM_KEYS=y
+CONFIG_NVME_AUTH=m
 CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
+CONFIG_NVME_KEYRING=m
 CONFIG_OBJTOOL=y
 CONFIG_OID_REGISTRY=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -4020,9 +4035,6 @@ CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SHIFT=12
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
-CONFIG_PAHOLE_VERSION=127
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PCIE_PME=y
 CONFIG_PCI_ATS=y
@@ -4033,6 +4045,7 @@ CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_PHYLINK=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PM_SLEEP=y
@@ -4095,7 +4108,8 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PMD_PTLOCKS=y
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_SQUASHFS_DECOMP_MULTI=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
@@ -4172,6 +4186,7 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
 CONFIG_X86=y
 CONFIG_X86_64=y
 CONFIG_X86_64_SMP=y
+CONFIG_X86_BROADCAST_TLB_FLUSH=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_DEBUGCTLMSR=y

debian/libcpupower1.symbols

@@ -36,6 +36,7 @@ libcpupower.so.1 libcpupower1 #MINVER#
  cpuidle_state_disable@Base 4.7~rc2-1~exp1
  cpuidle_state_latency@Base 4.7~rc2-1~exp1
  cpuidle_state_name@Base 4.7~rc2-1~exp1
+ cpuidle_state_residency@Base 6.12~rc2-1~exp1
  cpuidle_state_time@Base 4.7~rc2-1~exp1
  cpuidle_state_usage@Base 4.7~rc2-1~exp1
  cpupower_is_cpu_online@Base 4.7~rc2-1~exp1

debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch

@@ -1,24 +0,0 @@
-From ae6a452692f8b02115019b0b62ac82ae2c432f59 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Wed, 23 Oct 2024 21:28:33 +0200
-Subject: [PATCH] Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger
- than 4K"
-
-This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890.
----
- drivers/mmc/host/dw_mmc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/mmc/host/dw_mmc.c
-+++ b/drivers/mmc/host/dw_mmc.c
-@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mc
- 	if (host->use_dma == TRANS_MODE_IDMAC) {
- 		mmc->max_segs = host->ring_size;
- 		mmc->max_blk_size = 65535;
--		mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size;
--		mmc->max_seg_size = mmc->max_req_size;
-+		mmc->max_seg_size = 0x1000;
-+		mmc->max_req_size = mmc->max_seg_size * host->ring_size;
- 		mmc->max_blk_count = mmc->max_req_size / 512;
- 	} else if (host->use_dma == TRANS_MODE_EDMAC) {
- 		mmc->max_segs = 64;

debian/patches/bugfix/all/disable-some-marvell-phys.patch

@@ -42,7 +42,7 @@ correctness.
  
  static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs)
  {
-@@ -3790,6 +3794,7 @@ static struct phy_driver marvell_drivers
+@@ -3792,6 +3796,7 @@ static struct phy_driver marvell_drivers
  		.led_hw_control_set = m88e1318_led_hw_control_set,
  		.led_hw_control_get = m88e1318_led_hw_control_get,
  	},
@@ -50,7 +50,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1145,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3813,6 +3818,8 @@ static struct phy_driver marvell_drivers
+@@ -3815,6 +3820,8 @@ static struct phy_driver marvell_drivers
  		.cable_test_start = m88e1111_vct_cable_test_start,
  		.cable_test_get_status = m88e1111_vct_cable_test_get_status,
  	},
@@ -59,7 +59,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1149R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3831,6 +3838,8 @@ static struct phy_driver marvell_drivers
+@@ -3833,6 +3840,8 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -68,7 +68,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1240,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -3851,6 +3860,7 @@ static struct phy_driver marvell_drivers
+@@ -3853,6 +3862,7 @@ static struct phy_driver marvell_drivers
  		.get_tunable = m88e1011_get_tunable,
  		.set_tunable = m88e1011_set_tunable,
  	},
@@ -76,7 +76,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1116R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -4139,9 +4149,9 @@ static struct mdio_device_id __maybe_unu
+@@ -4141,9 +4151,9 @@ static struct mdio_device_id __maybe_unu
  	{ MARVELL_PHY_ID_88E1111_FINISAR, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },

debian/patches/bugfix/all/drm-amdkfd-Fix-user-queue-validation-on-Gfx7-8.patch

@@ -0,0 +1,61 @@
+From: Philip Yang <Philip.Yang@amd.com>
+Date: Wed, 29 Jan 2025 12:37:30 -0500
+Subject: drm/amdkfd: Fix user queue validation on Gfx7/8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://gitlab.freedesktop.org/drm/kernel/-/commit/e7a477735f1771b9a9346a5fbd09d7ff0641723a
+Bug-Debian: https://bugs.debian.org/1093124
+
+To workaround queue full h/w issue on Gfx7/8, when application create
+AQL queue, the ring buffer bo allocate size is queue_size/2 and
+map queue_size ring buffer to GPU in 2 pieces using 2 attachments, each
+attachment map size is queue_size/2, with same ring_bo backing memory.
+
+For Gfx7/8, user queue buffer validation should use queue_size/2 to
+verify ring_bo allocation and mapping size.
+
+Fixes: 68e599db7a54 ("drm/amdkfd: Validate user queue buffers")
+Suggested-by: Tomáš Trnka <trnka@scm.com>
+Signed-off-by: Philip Yang <Philip.Yang@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
+@@ -233,6 +233,7 @@ void kfd_queue_buffer_put(struct amdgpu_
+ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_properties *properties)
+ {
+ 	struct kfd_topology_device *topo_dev;
++	u64 expected_queue_size;
+ 	struct amdgpu_vm *vm;
+ 	u32 total_cwsr_size;
+ 	int err;
+@@ -241,6 +242,15 @@ int kfd_queue_acquire_buffers(struct kfd
+ 	if (!topo_dev)
+ 		return -EINVAL;
+ 
++	/* AQL queues on GFX7 and GFX8 appear twice their actual size */
++	if (properties->type == KFD_QUEUE_TYPE_COMPUTE &&
++	    properties->format == KFD_QUEUE_FORMAT_AQL &&
++	    topo_dev->node_props.gfx_target_version >= 70000 &&
++	    topo_dev->node_props.gfx_target_version < 90000)
++		expected_queue_size = properties->queue_size / 2;
++	else
++		expected_queue_size = properties->queue_size;
++
+ 	vm = drm_priv_to_vm(pdd->drm_priv);
+ 	err = amdgpu_bo_reserve(vm->root.bo, false);
+ 	if (err)
+@@ -255,7 +265,7 @@ int kfd_queue_acquire_buffers(struct kfd
+ 		goto out_err_unreserve;
+ 
+ 	err = kfd_queue_buffer_get(vm, (void *)properties->queue_address,
+-				   &properties->ring_bo, properties->queue_size);
++				   &properties->ring_bo, expected_queue_size);
+ 	if (err)
+ 		goto out_err_unreserve;
+ 

debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch

@@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -2638,7 +2638,7 @@ module_exit(exit_btrfs_fs)
+@@ -2618,7 +2618,7 @@ module_exit(exit_btrfs_fs)
  
  MODULE_DESCRIPTION("B-Tree File System (BTRFS)");
  MODULE_LICENSE("GPL");
@@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  MODULE_SOFTDEP("pre: blake2b-256");
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
-@@ -7435,6 +7435,6 @@ static void __exit ext4_exit_fs(void)
+@@ -7447,6 +7447,6 @@ static void __exit ext4_exit_fs(void)
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Fourth Extended Filesystem");
  MODULE_LICENSE("GPL");
@@ -39,7 +39,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  module_exit(ext4_exit_fs)
 --- a/fs/jbd2/journal.c
 +++ b/fs/jbd2/journal.c
-@@ -3194,6 +3194,7 @@ static void __exit journal_exit(void)
+@@ -3181,6 +3181,7 @@ static void __exit journal_exit(void)
  
  MODULE_DESCRIPTION("Generic filesystem journal-writing module");
  MODULE_LICENSE("GPL");
@@ -49,7 +49,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
 --- a/fs/nfsd/nfsctl.c
 +++ b/fs/nfsd/nfsctl.c
-@@ -2352,5 +2352,8 @@ static void __exit exit_nfsd(void)
+@@ -2384,5 +2384,8 @@ static void __exit exit_nfsd(void)
  MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
  MODULE_DESCRIPTION("In-kernel NFS server");
  MODULE_LICENSE("GPL");

debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch

@@ -9,7 +9,7 @@ sources.
 
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -210,6 +210,11 @@ cmd_record_mcount = $(if $(findstring $(
+@@ -195,6 +195,11 @@ cmd_record_mcount = $(if $(findstring $(
  	$(sub_cmd_record_mcount))
  endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
  

debian/patches/bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch

@@ -7,7 +7,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/lib/api/Makefile
 +++ b/tools/lib/api/Makefile
-@@ -39,7 +39,7 @@ endif
+@@ -35,7 +35,7 @@ ifeq ($(DEBUG),0)
  endif
  
  ifeq ($(DEBUG),0)

debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch

@@ -1,61 +0,0 @@
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sun, 20 Oct 2024 14:49:51 +0200
-Subject: netfilter: xtables: fix typo causing some targets not to load on IPv6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Origin: https://git.kernel.org/linus/306ed1728e8438caed30332e1ab46b28c25fe3d8
-Bug-Debian: https://bugs.debian.org/1085953
-
-- There is no NFPROTO_IPV6 family for mark and NFLOG.
-- TRACE is also missing module autoload with NFPROTO_IPV6.
-
-This results in ip6tables failing to restore a ruleset. This issue has been
-reported by several users providing incomplete patches.
-
-Very similar to Ilya Katsnelson's patch including a missing chunk in the
-TRACE extension.
-
-Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed")
-Reported-by: Ignat Korchagin <ignat@cloudflare.com>
-Reported-by: Ilya Katsnelson <me@0upti.me>
-Reported-by: Krzysztof Olędzki <ole@ans.pl>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/xt_NFLOG.c | 2 +-
- net/netfilter/xt_TRACE.c | 1 +
- net/netfilter/xt_mark.c  | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/net/netfilter/xt_NFLOG.c
-+++ b/net/netfilter/xt_NFLOG.c
-@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] _
- 	{
- 		.name       = "NFLOG",
- 		.revision   = 0,
--		.family     = NFPROTO_IPV4,
-+		.family     = NFPROTO_IPV6,
- 		.checkentry = nflog_tg_check,
- 		.destroy    = nflog_tg_destroy,
- 		.target     = nflog_tg,
---- a/net/netfilter/xt_TRACE.c
-+++ b/net/netfilter/xt_TRACE.c
-@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] _
- 		.target		= trace_tg,
- 		.checkentry	= trace_tg_check,
- 		.destroy	= trace_tg_destroy,
-+		.me		= THIS_MODULE,
- 	},
- #endif
- };
---- a/net/netfilter/xt_mark.c
-+++ b/net/netfilter/xt_mark.c
-@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __
- 	{
- 		.name           = "MARK",
- 		.revision       = 2,
--		.family         = NFPROTO_IPV4,
-+		.family         = NFPROTO_IPV6,
- 		.target         = mark_tg,
- 		.targetsize     = sizeof(struct xt_mark_tginfo2),
- 		.me             = THIS_MODULE,

debian/patches/bugfix/all/nfsd-fix-legacy-client-tracking-initialization.patch

@@ -0,0 +1,33 @@
+From: Scott Mayhew <smayhew@redhat.com>
+Date: Tue, 10 Dec 2024 07:25:54 -0500
+Subject: nfsd: fix legacy client tracking initialization
+Origin: https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/commit/?h=nfsd-next&id=45cd8c0c13fe5c9f1b926bd307df431f8f1b8a16
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=219580
+Bug-Debian: https://bugs.debian.org/1087900
+
+Get rid of the nfsd4_legacy_tracking_ops->init() call in
+check_for_legacy_methods().  That will be handled in the caller
+(nfsd4_client_tracking_init()).  Otherwise, we'll wind up calling
+nfsd4_legacy_tracking_ops->init() twice, and the second time we'll
+trigger the BUG_ON() in nfsd4_init_recdir().
+
+Fixes: 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking")
+Reported-by: Jur van der Burg <jur@avtware.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=219580
+Signed-off-by: Scott Mayhew <smayhew@redhat.com>
+Reviewed-by: Jeff Layton <jlayton@kernel.org>
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+---
+ fs/nfsd/nfs4recover.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/nfsd/nfs4recover.c
++++ b/fs/nfsd/nfs4recover.c
+@@ -2052,7 +2052,6 @@ static inline int check_for_legacy_metho
+ 		path_put(&path);
+ 		if (status)
+ 			return -ENOTDIR;
+-		status = nn->client_tracking_ops->init(net);
+ 	}
+ 	return status;
+ }

debian/patches/bugfix/all/perf-tools-pass-extra_cflags-through-to-libbpf-build-again.patch

@@ -16,7 +16,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -951,7 +951,7 @@ $(LIBAPI)-clean:
+@@ -953,7 +953,7 @@ $(LIBAPI)-clean:
  $(LIBBPF): FORCE | $(LIBBPF_OUTPUT)
  	$(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=$(FEATURE_DUMP_EXPORT) \
  		O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= subdir= \

debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch

@@ -73,7 +73,7 @@ of the patch
  static int radeon_pci_probe(struct pci_dev *pdev,
  			    const struct pci_device_id *ent)
  {
-@@ -295,6 +319,12 @@ static int radeon_pci_probe(struct pci_d
+@@ -296,6 +320,12 @@ static int radeon_pci_probe(struct pci_d
  	if (vga_switcheroo_client_probe_defer(pdev))
  		return -EPROBE_DEFER;
  

debian/patches/bugfix/all/revert-tools-build-clean-cflags-and-ldflags-for-fixdep.patch

@@ -10,12 +10,12 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/build/Makefile.include
 +++ b/tools/build/Makefile.include
-@@ -2,7 +2,7 @@
+@@ -12,7 +12,7 @@ else
- build := -f $(srctree)/tools/build/Makefile.build dir=. obj
+ endif
  
  fixdep:
--	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep
+-	$(SILENT_MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep
-+	$(Q)$(MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
++	$(SILENT_MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
  
  fixdep-clean:
  	$(Q)$(MAKE) -C $(srctree)/tools/build clean

debian/patches/bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch

@@ -6,7 +6,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
 ---
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -925,7 +925,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
+@@ -927,7 +927,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
  .SECONDARY: $(DLFILTERS:.so=.o)
  
  $(OUTPUT)dlfilters/%.so: $(OUTPUT)dlfilters/%.o

debian/patches/bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch

@@ -16,7 +16,7 @@ Acked-by: Ian Rogers <irogers@google.com>
 
 --- a/tools/lib/symbol/Makefile
 +++ b/tools/lib/symbol/Makefile
-@@ -39,7 +39,7 @@ endif
+@@ -35,7 +35,7 @@ ifeq ($(DEBUG),0)
  endif
  
  ifeq ($(DEBUG),0)

debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch

@@ -11,7 +11,7 @@ It broke feature detection that was working just fine for us.
 
 --- a/tools/perf/Makefile.config
 +++ b/tools/perf/Makefile.config
-@@ -61,7 +61,7 @@ ifeq ($(SRCARCH),x86)
+@@ -56,7 +56,7 @@ ifeq ($(SRCARCH),x86)
      LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
      $(call detected,CONFIG_X86_64)
    else

debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

@@ -21,7 +21,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -118,6 +118,12 @@
+@@ -120,6 +120,12 @@
  
  #include <kunit/visibility.h>
  
@@ -34,7 +34,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  /*
   * Minimum number of threads to boot the kernel
   */
-@@ -2135,6 +2141,10 @@ __latent_entropy struct task_struct *cop
+@@ -2157,6 +2163,10 @@ __latent_entropy struct task_struct *cop
  	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
  		return ERR_PTR(-EINVAL);
  
@@ -45,7 +45,7 @@ Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -3283,6 +3293,12 @@ int ksys_unshare(unsigned long unshare_f
+@@ -3310,6 +3320,12 @@ int ksys_unshare(unsigned long unshare_f
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  

debian/patches/debian/af_802154-Disable-auto-loading-as-mitigation-against.patch

@@ -21,7 +21,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/net/ieee802154/socket.c
 +++ b/net/ieee802154/socket.c
-@@ -1138,4 +1138,4 @@ module_exit(af_ieee802154_remove);
+@@ -1140,4 +1140,4 @@ module_exit(af_ieee802154_remove);
  
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("IEEE 802.15.4 socket interface");

debian/patches/debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch

@@ -22,7 +22,7 @@ implementation went from disk-io.c to super.c; forwarded the issue]
 
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -757,6 +757,18 @@ static void set_device_specific_options(
+@@ -766,6 +766,18 @@ static void set_device_specific_options(
  		btrfs_set_opt(fs_info->mount_opt, SSD);
  
  	/*

debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch

@@ -1,27 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: cdc_ncm,cdc_mbim: Use NCM by default
-Date: Sun, 31 Mar 2013 03:58:04 +0100
-Forwarded: not-needed
-
-Devices that support both NCM and MBIM modes should be kept in NCM
-mode unless there is userland support for MBIM.
-
-Set the default value of cdc_ncm.prefer_mbim to false and leave it to
-userland (modem-manager) to override this with a modprobe.conf file
-once it's ready to speak MBIM.
-
----
---- a/drivers/net/usb/cdc_ncm.c
-+++ b/drivers/net/usb/cdc_ncm.c
-@@ -54,11 +54,7 @@
- #include <linux/usb/cdc.h>
- #include <linux/usb/cdc_ncm.h>
- 
--#if IS_ENABLED(CONFIG_USB_NET_CDC_MBIM)
--static bool prefer_mbim = true;
--#else
- static bool prefer_mbim;
--#endif
- module_param(prefer_mbim, bool, 0644);
- MODULE_PARM_DESC(prefer_mbim, "Prefer MBIM setting on dual NCM/MBIM functions");
- 

debian/patches/debian/export-symbols-needed-by-android-drivers.patch

@@ -22,7 +22,7 @@ Export the currently un-exported symbols it depends on.
 
 --- a/fs/file.c
 +++ b/fs/file.c
-@@ -792,6 +792,7 @@ struct file *file_close_fd(unsigned int
+@@ -793,6 +793,7 @@ struct file *file_close_fd(unsigned int
  
  	return file;
  }
@@ -42,7 +42,7 @@ Export the currently un-exported symbols it depends on.
  	struct msg_msgseg *next;
 --- a/ipc/namespace.c
 +++ b/ipc/namespace.c
-@@ -205,6 +205,7 @@ void put_ipc_ns(struct ipc_namespace *ns
+@@ -207,6 +207,7 @@ void put_ipc_ns(struct ipc_namespace *ns
  			schedule_work(&free_ipc_work);
  	}
  }
@@ -72,7 +72,7 @@ Export the currently un-exported symbols it depends on.
   * Note: we use "set_current_state()" _after_ the wait-queue add,
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
-@@ -97,6 +97,7 @@ int task_work_add(struct task_struct *ta
+@@ -108,6 +108,7 @@ int task_work_add(struct task_struct *ta
  
  	return 0;
  }
@@ -82,7 +82,7 @@ Export the currently un-exported symbols it depends on.
   * task_work_cancel_match - cancel a pending work added by task_work_add()
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1934,6 +1934,7 @@ void zap_page_range_single(struct vm_are
+@@ -1937,6 +1937,7 @@ void zap_page_range_single(struct vm_are
  	tlb_finish_mmu(&tlb);
  	hugetlb_zap_end(vma, details);
  }
@@ -92,7 +92,7 @@ Export the currently un-exported symbols it depends on.
   * zap_vma_ptes - remove ptes mapping the vma
 --- a/security/security.c
 +++ b/security/security.c
-@@ -893,6 +893,7 @@ int security_binder_set_context_mgr(cons
+@@ -997,6 +997,7 @@ int security_binder_set_context_mgr(cons
  {
  	return call_int_hook(binder_set_context_mgr, mgr);
  }
@@ -100,7 +100,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transaction() - Check if a binder transaction is allowed
-@@ -908,6 +909,7 @@ int security_binder_transaction(const st
+@@ -1012,6 +1013,7 @@ int security_binder_transaction(const st
  {
  	return call_int_hook(binder_transaction, from, to);
  }
@@ -108,7 +108,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transfer_binder() - Check if a binder transfer is allowed
-@@ -923,6 +925,7 @@ int security_binder_transfer_binder(cons
+@@ -1027,6 +1029,7 @@ int security_binder_transfer_binder(cons
  {
  	return call_int_hook(binder_transfer_binder, from, to);
  }
@@ -116,7 +116,7 @@ Export the currently un-exported symbols it depends on.
  
  /**
   * security_binder_transfer_file() - Check if a binder file xfer is allowed
-@@ -939,6 +942,7 @@ int security_binder_transfer_file(const
+@@ -1043,6 +1046,7 @@ int security_binder_transfer_file(const
  {
  	return call_int_hook(binder_transfer_file, from, to, file);
  }

debian/patches/debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch

@@ -12,7 +12,7 @@ actually used.
 ---
 --- a/fs/notify/fanotify/fanotify_user.c
 +++ b/fs/notify/fanotify/fanotify_user.c
-@@ -1752,6 +1752,14 @@ static int do_fanotify_mark(int fanotify
+@@ -1763,6 +1763,14 @@ static int do_fanotify_mark(int fanotify
  		umask = FANOTIFY_EVENT_FLAGS;
  	}
  
@@ -25,5 +25,5 @@ actually used.
 +#endif
 +
  	f = fdget(fanotify_fd);
- 	if (unlikely(!f.file))
+ 	if (unlikely(!fd_file(f)))
  		return -EBADF;

debian/patches/debian/fixdep-allow-overriding-hostcc-and-hostld.patch

@@ -12,13 +12,13 @@ override HOSTCC and HOSTLD for fixdep only.
 ---
 --- a/tools/build/Makefile.include
 +++ b/tools/build/Makefile.include
-@@ -2,7 +2,10 @@
+@@ -12,7 +12,10 @@ else
- build := -f $(srctree)/tools/build/Makefile.build dir=. obj
+ endif
  
  fixdep:
--	$(Q)$(MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
+-	$(SILENT_MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
-+	$(Q)$(MAKE) -C $(srctree)/tools/build \
++	$(SILENT_MAKE) -C $(srctree)/tools/build \
-+		$(if $(REALHOSTCC),HOSTCC=$(REALHOSTCC) HOSTCFLAGS=) \
++		$(if $(REALHOSTCC),HOSTCC=$(REALHOSTCC) KBUILD_HOSTCFLAGS=) \
 +		$(if $(REALHOSTLD),HOSTLD=$(REALHOSTLD) KBUILD_HOSTLDFLAGS=) \
 +		$(OUTPUT)fixdep
  

debian/patches/debian/gitignore.patch

@@ -1,55 +0,0 @@
-From: Ian Campbell <ijc@hellion.org.uk>
-Date: Thu, 17 Jan 2013 08:55:21 +0000
-Subject: Tweak gitignore for Debian pkg-kernel using git
-Forwarded: not-needed
-
-[bwh: Tweak further for pure git]
----
- .gitignore | 25 +++++++------------------
- 1 file changed, 7 insertions(+), 18 deletions(-)
-
---- a/.gitignore
-+++ b/.gitignore
-@@ -78,11 +78,6 @@ modules.order
- /rpmbuild/
- 
- #
--# Debian directory (make deb-pkg)
--#
--/debian/
--
--#
- # Snap directory (make snap-pkg)
- #
- /snap/
-@@ -99,19 +94,6 @@ modules.order
- /pacman/
- 
- #
--# We don't want to ignore the following even if they are dot-files
--#
--!.clang-format
--!.cocciconfig
--!.editorconfig
--!.get_maintainer.ignore
--!.gitattributes
--!.gitignore
--!.kunitconfig
--!.mailmap
--!.rustfmt.toml
--
--#
- # Generated include files
- #
- /include/config/
-@@ -176,3 +158,10 @@ sphinx_*/
- 
- # Rust analyzer configuration
- /rust-project.json
-+
-+#
-+# Debian packaging: ignore everything at the top level, since it isn't
-+# included in our repository
-+#
-+/*
-+!/debian/

debian/patches/debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/net/ax25/af_ax25.c
 +++ b/net/ax25/af_ax25.c
-@@ -2066,7 +2066,7 @@ module_init(ax25_init);
+@@ -2077,7 +2077,7 @@ module_init(ax25_init);
  MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
  MODULE_DESCRIPTION("The amateur radio AX.25 link layer protocol");
  MODULE_LICENSE("GPL");
@@ -37,7 +37,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  {
 --- a/net/rose/af_rose.c
 +++ b/net/rose/af_rose.c
-@@ -1630,7 +1630,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
+@@ -1638,7 +1638,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
  MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
  MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol");
  MODULE_LICENSE("GPL");

debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch

@@ -27,14 +27,14 @@ rules.real and change Makefile.modfinal to look for it in both places.
 
 --- a/scripts/Makefile.modfinal
 +++ b/scripts/Makefile.modfinal
-@@ -30,11 +30,13 @@ quiet_cmd_cc_o_c = CC [M]  $@
+@@ -33,11 +33,13 @@ quiet_cmd_cc_o_c = CC [M]  $@
- %.mod.o: %.mod.c FORCE
+ $(extmod_prefix).module-common.o: $(srctree)/scripts/module-common.c FORCE
  	$(call if_changed_dep,cc_o_c)
  
 +ARCH_MODULE_LDS := $(word 1,$(wildcard scripts/module.lds arch/$(SRCARCH)/module.lds))
 +
  quiet_cmd_ld_ko_o = LD [M]  $@
-       cmd_ld_ko_o +=							\
+       cmd_ld_ko_o =							\
  	$(LD) -r $(KBUILD_LDFLAGS)					\
  		$(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE)		\
 -		-T scripts/module.lds -o $@ $(filter %.o, $^)
@@ -42,12 +42,12 @@ rules.real and change Makefile.modfinal to look for it in both places.
  
  quiet_cmd_btf_ko = BTF [M] $@
        cmd_btf_ko = 							\
-@@ -54,7 +56,7 @@ if_changed_except = $(if $(call newer_pr
+@@ -57,7 +59,7 @@ if_changed_except = $(if $(call newer_pr
  	printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
  
  # Re-generate module BTFs if either module's .ko or vmlinux changed
--%.ko: %.o %.mod.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
+-%.ko: %.o %.mod.o $(extmod_prefix).module-common.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
-+%.ko: %.o %.mod.o $(ARCH_MODULE_LDS) $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
++%.ko: %.o %.mod.o $(extmod_prefix).module-common.o $(ARCH_MODULE_LDS) $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
  	+$(call if_changed_except,ld_ko_o,vmlinux)
  ifdef CONFIG_DEBUG_INFO_BTF_MODULES
  	+$(if $(newer-prereqs),$(call cmd,btf_ko))

debian/patches/debian/kernelvariables.patch

@@ -54,7 +54,7 @@ use of $(ARCH) needs to be moved after this.
  KCONFIG_CONFIG	?= .config
  export KCONFIG_CONFIG
  
-@@ -524,6 +494,35 @@ RUSTFLAGS_KERNEL =
+@@ -529,6 +499,35 @@ RUSTFLAGS_KERNEL =
  AFLAGS_KERNEL	=
  LDFLAGS_vmlinux =
  

debian/patches/debian/linux-perf-remove-remaining-source-filenames-from-executable.patch

@@ -15,7 +15,7 @@ to the installed location.
 ---
 --- a/tools/perf/builtin-report.c
 +++ b/tools/perf/builtin-report.c
-@@ -655,10 +655,12 @@ static int report__browse_hists(struct r
+@@ -662,10 +662,12 @@ static int report__browse_hists(struct r
  
  	path = system_path(TIPDIR);
  	if (perf_tip(&help, path) || help == NULL) {
@@ -41,7 +41,7 @@ to the installed location.
  perf-test-y += workloads/
 --- a/tools/perf/Build
 +++ b/tools/perf/Build
-@@ -51,7 +51,7 @@ CFLAGS_perf.o              += -DPERF_HTM
+@@ -52,7 +52,7 @@ CFLAGS_perf.o              += -DPERF_HTM
  			      -DPREFIX="BUILD_STR($(prefix_SQ))"
  CFLAGS_builtin-trace.o	   += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))"
  CFLAGS_builtin-report.o	   += -DTIPDIR="BUILD_STR($(tipdir_SQ))"

debian/patches/debian/makefile-make-compiler-version-comparison-optional.patch

@@ -20,7 +20,7 @@ is non-empty.
 ---
 --- a/Makefile
 +++ b/Makefile
-@@ -1807,7 +1807,7 @@ PHONY += prepare
+@@ -1825,7 +1825,7 @@ PHONY += prepare
  # now expand this into a simple variable to reduce the cost of shell evaluations
  prepare: CC_VERSION_TEXT := $(CC_VERSION_TEXT)
  prepare:

debian/patches/debian/tools-perf-install-python-bindings.patch

@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -1149,7 +1149,7 @@ install-bin: install-tools install-tests
+@@ -1153,7 +1153,7 @@ install-bin: install-tools install-tests
  install: install-bin try-install-man
  
  install-python_ext:

debian/patches/debian/tools-perf-perf-read-vdso-in-libexec.patch

@@ -4,7 +4,7 @@ Subject: linux-tools: Install perf-read-vdso{,x}32 in directory under /usr/lib
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -1073,21 +1073,21 @@ install-tools: all install-gtk
+@@ -1075,21 +1075,21 @@ install-tools: all install-gtk
  		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \
  		$(INSTALL) -m 644 include/perf/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf'

debian/patches/features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch

@@ -141,10 +141,10 @@ arm-init to efi-init common for all arch") renamed arm-init.c to efi-init.c]
  
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -766,7 +766,8 @@ extern void efi_mem_reserve(phys_addr_t
+@@ -765,7 +765,8 @@ extern int efi_mem_desc_lookup(u64 phys_
+ extern int __efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);
+ extern void efi_mem_reserve(phys_addr_t addr, u64 size);
  extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size);
- extern void efi_initialize_iomem_resources(struct resource *code_resource,
- 		struct resource *data_resource, struct resource *bss_resource);
 -extern u64 efi_get_fdt_params(struct efi_memory_map_data *data);
 +extern u64 efi_get_fdt_params(struct efi_memory_map_data *data,
 +			      u32 *secure_boot);

debian/patches/features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch

@@ -31,7 +31,7 @@ cc: linux-efi@vger.kernel.org
 
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1065,19 +1065,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1070,19 +1070,7 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
  
@@ -106,7 +106,7 @@ cc: linux-efi@vger.kernel.org
 +}
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -877,6 +877,14 @@ static inline int efi_range_is_wc(unsign
+@@ -876,6 +876,14 @@ static inline int efi_range_is_wc(unsign
  #define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
  #define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */
  #define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */
@@ -121,7 +121,7 @@ cc: linux-efi@vger.kernel.org
  
  #ifdef CONFIG_EFI
  /*
-@@ -901,6 +909,7 @@ static inline bool efi_rt_services_suppo
+@@ -900,6 +908,7 @@ static inline bool efi_rt_services_suppo
  	return (efi.runtime_supported_mask & mask) == mask;
  }
  extern void efi_find_mirror(void);
@@ -129,7 +129,7 @@ cc: linux-efi@vger.kernel.org
  #else
  static inline bool efi_enabled(int feature)
  {
-@@ -920,6 +929,7 @@ static inline bool efi_rt_services_suppo
+@@ -919,6 +928,7 @@ static inline bool efi_rt_services_suppo
  }
  
  static inline void efi_find_mirror(void) {}
@@ -137,7 +137,7 @@ cc: linux-efi@vger.kernel.org
  #endif
  
  extern int efi_status_to_err(efi_status_t status);
-@@ -1138,13 +1148,6 @@ static inline bool efi_runtime_disabled(
+@@ -1137,13 +1147,6 @@ static inline bool efi_runtime_disabled(
  extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);
  extern unsigned long efi_call_virt_save_flags(void);
  

debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch

@@ -35,7 +35,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
  	reserve_ibft_region();
  	x86_init.resources.dmi_setup();
  
-@@ -1065,8 +1067,6 @@ void __init setup_arch(char **cmdline_p)
+@@ -1070,8 +1072,6 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
  
@@ -67,26 +67,26 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
  		default:
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -509,6 +509,7 @@ int security_inode_getsecctx(struct inod
+@@ -522,6 +522,7 @@ int security_inode_notifysecctx(struct i
+ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
+ int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
  int security_locked_down(enum lockdown_reason what);
++int lock_kernel_down(const char *where, enum lockdown_reason level);
  int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len,
  		      void *val, size_t val_len, u64 id, u64 flags);
-+int lock_kernel_down(const char *where, enum lockdown_reason level);
+ int security_bdev_alloc(struct block_device *bdev);
- #else /* CONFIG_SECURITY */
+@@ -1504,6 +1505,11 @@ static inline int security_locked_down(e
- 
- static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1483,6 +1484,11 @@ static inline int lsm_fill_user_ctx(stru
  {
- 	return -EOPNOTSUPP;
+ 	return 0;
  }
 +static inline int
 +lock_kernel_down(const char *where, enum lockdown_reason level)
 +{
 +	return -EOPNOTSUPP;
 +}
- #endif	/* CONFIG_SECURITY */
+ static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx,
- 
+ 				    u32 *uctx_len, void *val, size_t val_len,
- #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
+ 				    u64 id, u64 flags)
 --- a/security/lockdown/Kconfig
 +++ b/security/lockdown/Kconfig
 @@ -45,3 +45,18 @@ config LOCK_DOWN_KERNEL_FORCE_CONFIDENTI

debian/patches/features/all/security-perf-allow-further-restriction-of-perf_event_open.patch

@@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/include/linux/perf_event.h
 +++ b/include/linux/perf_event.h
-@@ -1589,6 +1589,11 @@ int perf_cpu_time_max_percent_handler(co
+@@ -1623,6 +1623,11 @@ int perf_cpu_time_max_percent_handler(co
  int perf_event_max_stack_handler(const struct ctl_table *table, int write,
  		void *buffer, size_t *lenp, loff_t *ppos);
  
@@ -36,7 +36,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -419,8 +419,13 @@ static struct kmem_cache *perf_event_cac
+@@ -449,8 +449,13 @@ static struct kmem_cache *perf_event_cac
   *   0 - disallow raw tracepoint access for unpriv
   *   1 - disallow cpu events for unpriv
   *   2 - disallow kernel profiling for unpriv
@@ -50,7 +50,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
  /* Minimum for 512 kiB + 1 user control page */
  int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -12506,6 +12511,9 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -12691,6 +12696,9 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (err)
  		return err;
  

debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch

@@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/drivers/iommu/intel/Kconfig
 +++ b/drivers/iommu/intel/Kconfig
-@@ -57,13 +57,24 @@ config INTEL_IOMMU_SVM
+@@ -56,13 +56,24 @@ config INTEL_IOMMU_SVM
  	  to access DMA resources through process address space by
  	  means of a Process Address Space ID (PASID).
  
@@ -48,7 +48,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	def_bool y
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
-@@ -214,13 +214,13 @@ static LIST_HEAD(dmar_satc_units);
+@@ -205,13 +205,13 @@ static LIST_HEAD(dmar_satc_units);
  
  static void intel_iommu_domain_free(struct iommu_domain *domain);
  
@@ -64,7 +64,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  static int intel_iommu_superpage = 1;
  static int iommu_identity_mapping;
  static int iommu_skip_te_disable;
-@@ -259,6 +259,7 @@ static int __init intel_iommu_setup(char
+@@ -250,6 +250,7 @@ static int __init intel_iommu_setup(char
  	while (*str) {
  		if (!strncmp(str, "on", 2)) {
  			dmar_disabled = 0;

debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch

@@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2201,6 +2201,8 @@
+@@ -2218,6 +2218,8 @@
  			bypassed by not enabling DMAR with this option. In
  			this case, gfx device will use physical address for
  			DMA.
@@ -43,7 +43,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  #define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB)
  #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
  #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
-@@ -217,12 +220,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I
+@@ -208,12 +211,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I
  int intel_iommu_enabled = 0;
  EXPORT_SYMBOL_GPL(intel_iommu_enabled);
  
@@ -58,7 +58,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  
  const struct iommu_ops intel_iommu_ops;
  static const struct iommu_dirty_ops intel_dirty_ops;
-@@ -262,6 +267,9 @@ static int __init intel_iommu_setup(char
+@@ -253,6 +258,9 @@ static int __init intel_iommu_setup(char
  		} else if (!strncmp(str, "igfx_off", 8)) {
  			disable_igfx_iommu = 1;
  			pr_info("Disable GFX device mapping\n");
@@ -68,7 +68,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  		} else if (!strncmp(str, "forcedac", 8)) {
  			pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
  			iommu_dma_forcedac = true;
-@@ -2156,6 +2164,9 @@ static int device_def_domain_type(struct
+@@ -2046,6 +2054,9 @@ static int device_def_domain_type(struct
  
  		if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
  			return IOMMU_DOMAIN_IDENTITY;
@@ -78,7 +78,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	}
  
  	return 0;
-@@ -2456,6 +2467,9 @@ static int __init init_dmars(void)
+@@ -2344,6 +2355,9 @@ static int __init init_dmars(void)
  		iommu_set_root_entry(iommu);
  	}
  
@@ -87,4 +87,4 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +
  	check_tylersburg_isoch();
  
- 	ret = si_domain_init(hw_pass_through);
+ 	/*

debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch

@@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -6578,6 +6578,10 @@
+@@ -6641,6 +6641,10 @@
  			later by a loaded module cannot be set this way.
  			Example: sysctl.vm.swappiness=40
  
@@ -42,7 +42,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  			Ignore sysrq setting - this boot parameter will
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -3065,6 +3065,14 @@ config COMPAT_32
+@@ -3165,6 +3165,14 @@ config COMPAT_32
  	select HAVE_UID16
  	select OLD_SIGSUSPEND3
  

debian/patches/krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch

@@ -30,7 +30,7 @@ this reverts following commit:
 
 --- a/tools/objtool/check.c
 +++ b/tools/objtool/check.c
-@@ -4872,10 +4872,14 @@ int check(struct objtool_file *file)
+@@ -4897,10 +4897,14 @@ int check(struct objtool_file *file)
  	}
  
  out:

debian/patches/krd/0003-local-ports.patch

@@ -1,6 +1,6 @@
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1802,7 +1802,7 @@ static __net_init int inet_init_net(stru
+@@ -1800,7 +1800,7 @@ static __net_init int inet_init_net(stru
  	/*
  	 * Set defaults for local port range
  	 */

debian/patches/krd/0005-certs-genkey.patch

@@ -0,0 +1,11 @@
+--- a/certs/Makefile
++++ b/certs/Makefile
+@@ -47,7 +47,7 @@ keytype-$(CONFIG_MODULE_SIG_KEY_TYPE_ECD
+ quiet_cmd_gen_key = GENKEY  $@
+       cmd_gen_key = openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \
+ 		-batch -x509 -config $< \
+-		-outform PEM -out $@ -keyout $@ $(keytype-y) 2>&1
++		-outform PEM -out $@ -keyout $@ $(keytype-y) 2>/dev/null
+ 
+ $(obj)/signing_key.pem: $(obj)/x509.genkey FORCE
+ 	$(call if_changed,gen_key)

debian/patches/misc-bbr3/0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch

@@ -1,4 +1,4 @@
-From ce1cd7869a208112a8728d1fe9e373f78a2e4a6e Mon Sep 17 00:00:00 2001
+From b9540ffedb31e687585b586b9f96543928f6b99b Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Tue, 11 Jun 2019 12:26:55 -0400
 Subject: [PATCH 01/19] net-tcp_bbr: broaden app-limited rate sample detection
@@ -32,7 +32,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3961,6 +3961,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -3967,6 +3967,7 @@ static int tcp_ack(struct sock *sk, cons
  
  	prior_fack = tcp_is_sack(tp) ? tcp_highest_sack_seq(tp) : tp->snd_una;
  	rs.prior_in_flight = tcp_packets_in_flight(tp);
@@ -42,7 +42,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	 * is in window.
 --- a/net/ipv4/tcp_timer.c
 +++ b/net/ipv4/tcp_timer.c
-@@ -689,6 +689,7 @@ void tcp_write_timer_handler(struct sock
+@@ -690,6 +690,7 @@ void tcp_write_timer_handler(struct sock
  		return;
  	}
  

debian/patches/misc-bbr3/0002-net-tcp_bbr-v2-shrink-delivered_mstamp-first_tx_msta.patch

@@ -1,4 +1,4 @@
-From b32715fbe2ab96d1060ec37bb9c03feedf366494 Mon Sep 17 00:00:00 2001
+From 9fd50b0891febee43126ba643bfe56f72dd23bad Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sun, 24 Jun 2018 21:55:59 -0400
 Subject: [PATCH 02/19] net-tcp_bbr: v2: shrink delivered_mstamp,
@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -884,6 +884,11 @@ static inline u32 tcp_stamp_us_delta(u64
+@@ -901,6 +901,11 @@ static inline u32 tcp_stamp_us_delta(u64
  	return max_t(s64, t1 - t0, 0);
  }
  
@@ -37,7 +37,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  /* provide the departure time in us unit */
  static inline u64 tcp_skb_timestamp_us(const struct sk_buff *skb)
  {
-@@ -973,9 +978,9 @@ struct tcp_skb_cb {
+@@ -990,9 +995,9 @@ struct tcp_skb_cb {
  			/* pkts S/ACKed so far upon tx of skb, incl retrans: */
  			__u32 delivered;
  			/* start of send pipeline phase */

debian/patches/misc-bbr3/0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch

@@ -1,4 +1,4 @@
-From 25856231832186fe13189b986cc0e91860c18201 Mon Sep 17 00:00:00 2001
+From 7c5c7e14043aaf99390cb9c71140f63cd574ffda Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sat, 5 Aug 2017 11:49:50 -0400
 Subject: [PATCH 03/19] net-tcp_bbr: v2: snapshot packets in flight at transmit
@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -981,6 +981,10 @@ struct tcp_skb_cb {
+@@ -998,6 +998,10 @@ struct tcp_skb_cb {
  			u32 first_tx_mstamp;
  			/* when we reached the "delivered" count */
  			u32 delivered_mstamp;
@@ -38,7 +38,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		} tx;   /* only used for outgoing skbs */
  		union {
  			struct inet_skb_parm	h4;
-@@ -1136,6 +1140,7 @@ struct rate_sample {
+@@ -1154,6 +1158,7 @@ struct rate_sample {
  	u64  prior_mstamp; /* starting timestamp for interval */
  	u32  prior_delivered;	/* tp->delivered at "prior_mstamp" */
  	u32  prior_delivered_ce;/* tp->delivered_ce at "prior_mstamp" */
@@ -46,7 +46,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	s32  delivered;		/* number of packets delivered over interval */
  	s32  delivered_ce;	/* number of packets delivered w/ CE marks*/
  	long interval_us;	/* time for tp->delivered to incr "delivered" */
-@@ -1258,6 +1263,7 @@ static inline void tcp_ca_event(struct s
+@@ -1276,6 +1281,7 @@ static inline void tcp_ca_event(struct s
  void tcp_set_ca_state(struct sock *sk, const u8 ca_state);
  
  /* From tcp_rate.c */
@@ -56,7 +56,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  			    struct rate_sample *rs);
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -2765,6 +2765,7 @@ static bool tcp_write_xmit(struct sock *
+@@ -2770,6 +2770,7 @@ static bool tcp_write_xmit(struct sock *
  			skb_set_delivery_time(skb, tp->tcp_wstamp_ns, SKB_CLOCK_MONOTONIC);
  			list_move_tail(&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue);
  			tcp_init_tso_segs(skb, mss_now);

debian/patches/misc-bbr3/0004-net-tcp_bbr-v2-count-packets-lost-over-TCP-rate-samp.patch

@@ -1,4 +1,4 @@
-From b1772710e8b5b98c09e96d4f1af620cd938fddf7 Mon Sep 17 00:00:00 2001
+From 205288c0ef4b4059c0ae8a2bb85b74a1c371d700 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Thu, 12 Oct 2017 23:44:27 -0400
 Subject: [PATCH 04/19] net-tcp_bbr: v2: count packets lost over TCP rate
@@ -19,7 +19,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -985,6 +985,7 @@ struct tcp_skb_cb {
+@@ -1002,6 +1002,7 @@ struct tcp_skb_cb {
  #define TCPCB_IN_FLIGHT_MAX ((1U << TCPCB_IN_FLIGHT_BITS) - 1)
  			u32 in_flight:20,   /* packets in flight at transmit */
  			    unused2:12;
@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		} tx;   /* only used for outgoing skbs */
  		union {
  			struct inet_skb_parm	h4;
-@@ -1138,11 +1139,13 @@ struct ack_sample {
+@@ -1156,11 +1157,13 @@ struct ack_sample {
   */
  struct rate_sample {
  	u64  prior_mstamp; /* starting timestamp for interval */

debian/patches/misc-bbr3/0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch

@@ -1,4 +1,4 @@
-From fdf01142aea8645186e080f1278d3b5a5fd8c66c Mon Sep 17 00:00:00 2001
+From 1fe2a421fbf80580ad76f528c6489633667e5851 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Mon, 19 Nov 2018 13:48:36 -0500
 Subject: [PATCH 05/19] net-tcp_bbr: v2: export FLAG_ECE in rate_sample.is_ece
@@ -18,7 +18,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1157,6 +1157,7 @@ struct rate_sample {
+@@ -1175,6 +1175,7 @@ struct rate_sample {
  	bool is_app_limited;	/* is sample from packet with bubble in pipe? */
  	bool is_retrans;	/* is sample from retransmission? */
  	bool is_ack_delayed;	/* is this (likely) a delayed ACK? */
@@ -28,7 +28,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  struct tcp_congestion_ops {
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4060,6 +4060,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -4066,6 +4066,7 @@ static int tcp_ack(struct sock *sk, cons
  	delivered = tcp_newly_delivered(sk, delivered, flag);
  	lost = tp->lost - lost;			/* freshly marked lost */
  	rs.is_ack_delayed = !!(flag & FLAG_ACK_MAYBE_DELAYED);

debian/patches/misc-bbr3/0006-net-tcp_bbr-v2-introduce-ca_ops-skb_marked_lost-CC-m.patch

@@ -1,4 +1,4 @@
-From a3e88432c2ebf12de9c2053a13417ddf2ad4cb4e Mon Sep 17 00:00:00 2001
+From 96bcebd73a3df154c7c5100694deb069a2157655 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Tue, 7 Aug 2018 21:52:06 -0400
 Subject: [PATCH 06/19] net-tcp_bbr: v2: introduce ca_ops->skb_marked_lost() CC
@@ -30,7 +30,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1184,6 +1184,9 @@ struct tcp_congestion_ops {
+@@ -1202,6 +1202,9 @@ struct tcp_congestion_ops {
  	/* override sysctl_tcp_min_tso_segs */
  	u32 (*min_tso_segs)(struct sock *sk);
  
@@ -42,7 +42,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	 */
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1120,7 +1120,12 @@ static void tcp_verify_retransmit_hint(s
+@@ -1126,7 +1126,12 @@ static void tcp_verify_retransmit_hint(s
   */
  static void tcp_notify_skb_loss_event(struct tcp_sock *tp, const struct sk_buff *skb)
  {

debian/patches/misc-bbr3/0007-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-merge-in.patch

@@ -1,4 +1,4 @@
-From af7d33e71649b8e2ae00dccf336720a8ab891606 Mon Sep 17 00:00:00 2001
+From ab109789c18f7edf7a34923398a64ba7ba38cc6c Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Wed, 1 May 2019 20:16:33 -0400
 Subject: [PATCH 07/19] net-tcp_bbr: v2: adjust skb tx.in_flight upon merge in
@@ -39,7 +39,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1506,6 +1506,17 @@ static bool tcp_shifted_skb(struct sock
+@@ -1512,6 +1512,17 @@ static bool tcp_shifted_skb(struct sock
  	WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);
  	tcp_skb_pcount_add(skb, -pcount);
  

debian/patches/misc-bbr3/0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch

@@ -1,4 +1,4 @@
-From a4d44bce49f61f8755f558dc40edff5f8958b7c6 Mon Sep 17 00:00:00 2001
+From 6d0d550fdc6692ee65d01453d380ffba4b5a97e9 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Wed, 1 May 2019 20:16:25 -0400
 Subject: [PATCH 08/19] net-tcp_bbr: v2: adjust skb tx.in_flight upon split in
@@ -31,7 +31,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1283,6 +1283,21 @@ static inline bool tcp_skb_sent_after(u6
+@@ -1301,6 +1301,21 @@ static inline bool tcp_skb_sent_after(u6
  	return t1 > t2 || (t1 == t2 && after(seq1, seq2));
  }
  
@@ -55,7 +55,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
   * between different flows.
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -1601,7 +1601,7 @@ int tcp_fragment(struct sock *sk, enum t
+@@ -1606,7 +1606,7 @@ int tcp_fragment(struct sock *sk, enum t
  {
  	struct tcp_sock *tp = tcp_sk(sk);
  	struct sk_buff *buff;
@@ -64,7 +64,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	long limit;
  	int nlen;
  	u8 flags;
-@@ -1676,6 +1676,30 @@ int tcp_fragment(struct sock *sk, enum t
+@@ -1681,6 +1681,30 @@ int tcp_fragment(struct sock *sk, enum t
  
  		if (diff)
  			tcp_adjust_pcount(sk, skb, diff);

debian/patches/misc-bbr3/0009-net-tcp-add-new-ca-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch

@@ -1,4 +1,4 @@
-From 65cca0e8fd954a150ec874650af47f7800ea3049 Mon Sep 17 00:00:00 2001
+From 55dba52fd12522bb1c211acdd37f051e8bf5c57b Mon Sep 17 00:00:00 2001
 From: Yousuk Seung <ysseung@google.com>
 Date: Wed, 23 May 2018 17:55:54 -0700
 Subject: [PATCH 09/19] net-tcp: add new ca opts flag TCP_CONG_WANTS_CE_EVENTS
@@ -23,7 +23,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1119,7 +1119,11 @@ enum tcp_ca_ack_event_flags {
+@@ -1137,7 +1137,11 @@ enum tcp_ca_ack_event_flags {
  #define TCP_CONG_NON_RESTRICTED 0x1
  /* Requires ECN/ECT set on all packets */
  #define TCP_CONG_NEEDS_ECN	0x2
@@ -36,7 +36,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  union tcp_cc_info;
  
-@@ -1251,6 +1255,14 @@ static inline char *tcp_ca_get_name_by_k
+@@ -1269,6 +1273,14 @@ static inline char *tcp_ca_get_name_by_k
  }
  #endif
  
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	const struct inet_connection_sock *icsk = inet_csk(sk);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -370,7 +370,7 @@ static void __tcp_ecn_check_ce(struct so
+@@ -376,7 +376,7 @@ static void __tcp_ecn_check_ce(struct so
  			tcp_enter_quickack_mode(sk, 2);
  		break;
  	case INET_ECN_CE:
@@ -62,7 +62,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  			tcp_ca_event(sk, CA_EVENT_ECN_IS_CE);
  
  		if (!(tp->ecn_flags & TCP_ECN_DEMAND_CWR)) {
-@@ -381,7 +381,7 @@ static void __tcp_ecn_check_ce(struct so
+@@ -387,7 +387,7 @@ static void __tcp_ecn_check_ce(struct so
  		tp->ecn_flags |= TCP_ECN_SEEN;
  		break;
  	default:

debian/patches/misc-bbr3/0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch

@@ -1,4 +1,4 @@
-From 3acb852e1cfcdeea388bd428c6dd81609fd40792 Mon Sep 17 00:00:00 2001
+From 2c015b38804583667528b976c1cc9f9c1c42c104 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Fri, 27 Sep 2019 17:10:26 -0400
 Subject: [PATCH 10/19] net-tcp: re-generalize TSO sizing in TCP CC module API
@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1185,8 +1185,8 @@ struct tcp_congestion_ops {
+@@ -1203,8 +1203,8 @@ struct tcp_congestion_ops {
  	/* hook for packet ack accounting (optional) */
  	void (*pkts_acked)(struct sock *sk, const struct ack_sample *sample);
  
@@ -97,7 +97,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  };
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -2057,13 +2057,12 @@ static u32 tcp_tso_autosize(const struct
+@@ -2062,13 +2062,12 @@ static u32 tcp_tso_autosize(const struct
  static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now)
  {
  	const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops;

debian/patches/misc-bbr3/0011-net-tcp-add-fast_ack_mode-1-skip-rwin-check-in-tcp_f.patch

@@ -1,4 +1,4 @@
-From 3741ada76bab5111cbb9c279cf27e67a0334eb05 Mon Sep 17 00:00:00 2001
+From 3002091ca590f27c6c7c5966883502c87502e01f Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sun, 7 Jan 2024 21:11:26 -0300
 Subject: [PATCH 11/19] net-tcp: add fast_ack_mode=1: skip rwin check in
@@ -33,7 +33,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
-@@ -3123,6 +3123,7 @@ int tcp_disconnect(struct sock *sk, int
+@@ -3397,6 +3397,7 @@ int tcp_disconnect(struct sock *sk, int
  	tp->rx_opt.dsack = 0;
  	tp->rx_opt.num_sacks = 0;
  	tp->rcv_ooopack = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	if (tcp_ca_needs_ecn(sk))
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -5763,13 +5763,14 @@ static void __tcp_ack_snd_check(struct s
+@@ -5776,13 +5776,14 @@ static void __tcp_ack_snd_check(struct s
  
  	    /* More than one full frame received... */
  	if (((tp->rcv_nxt - tp->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss &&

debian/patches/misc-bbr3/0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch

@@ -1,4 +1,4 @@
-From e5d35b7c882b7001f8a31b14c9f08917230dedc3 Mon Sep 17 00:00:00 2001
+From 687f09c22583ec5ef52aa93844248c9f93a2ce6e Mon Sep 17 00:00:00 2001
 From: Jianfeng Wang <jfwang@google.com>
 Date: Fri, 19 Jun 2020 17:33:45 +0000
 Subject: [PATCH 12/19] net-tcp_bbr: v2: record app-limited status of
@@ -35,7 +35,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -3003,6 +3003,7 @@ void tcp_send_loss_probe(struct sock *sk
+@@ -3008,6 +3008,7 @@ void tcp_send_loss_probe(struct sock *sk
  	if (WARN_ON(!skb || !tcp_skb_pcount(skb)))
  		goto rearm_timer;
  

debian/patches/misc-bbr3/0013-net-tcp_bbr-v2-inform-CC-module-of-losses-repaired-b.patch

@@ -1,4 +1,4 @@
-From 77e7c22b63f8934206b1e89c173558c3967f0779 Mon Sep 17 00:00:00 2001
+From 024469ad0aec82573e1aa8f3dde55aeac4c35aee Mon Sep 17 00:00:00 2001
 From: Jianfeng Wang <jfwang@google.com>
 Date: Tue, 16 Jun 2020 17:41:19 +0000
 Subject: [PATCH 13/19] net-tcp_bbr: v2: inform CC module of losses repaired by
@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1097,6 +1097,7 @@ enum tcp_ca_event {
+@@ -1115,6 +1115,7 @@ enum tcp_ca_event {
  	CA_EVENT_LOSS,		/* loss timeout */
  	CA_EVENT_ECN_NO_CE,	/* ECT set, but not CE marked */
  	CA_EVENT_ECN_IS_CE,	/* received CE marked IP packet */
@@ -35,7 +35,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  /* Information about inbound ACK, passed to cong_ops->in_ack_event() */
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3859,6 +3859,7 @@ static void tcp_process_tlp_ack(struct s
+@@ -3865,6 +3865,7 @@ static void tcp_process_tlp_ack(struct s
  		/* ACK advances: there was a loss, so reduce cwnd. Reset
  		 * tlp_high_seq in tcp_init_cwnd_reduction()
  		 */

debian/patches/misc-bbr3/0014-net-tcp_bbr-v2-introduce-is_acking_tlp_retrans_seq-i.patch

@@ -1,4 +1,4 @@
-From cab22a8e2e87870e8334a12ffcd0ba04ea81126f Mon Sep 17 00:00:00 2001
+From 31adbbdcafaeac73d39cae76c6d513fea28779f1 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Mon, 21 Sep 2020 14:46:26 -0400
 Subject: [PATCH 14/19] net-tcp_bbr: v2: introduce is_acking_tlp_retrans_seq
@@ -21,7 +21,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -1161,6 +1161,7 @@ struct rate_sample {
+@@ -1179,6 +1179,7 @@ struct rate_sample {
  	u32  last_end_seq;	/* end_seq of most recently ACKed packet */
  	bool is_app_limited;	/* is sample from packet with bubble in pipe? */
  	bool is_retrans;	/* is sample from retransmission? */
@@ -31,7 +31,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  };
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3842,7 +3842,8 @@ static void tcp_replace_ts_recent(struct
+@@ -3848,7 +3848,8 @@ static void tcp_replace_ts_recent(struct
  /* This routine deals with acks during a TLP episode and ends an episode by
   * resetting tlp_high_seq. Ref: TLP algorithm in draft-ietf-tcpm-rack
   */
@@ -41,7 +41,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  {
  	struct tcp_sock *tp = tcp_sk(sk);
  
-@@ -3870,6 +3871,11 @@ static void tcp_process_tlp_ack(struct s
+@@ -3876,6 +3877,11 @@ static void tcp_process_tlp_ack(struct s
  			     FLAG_NOT_DUP | FLAG_DATA_SACKED))) {
  		/* Pure dupack: original and TLP probe arrived; no loss */
  		tp->tlp_high_seq = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	}
  }
  
-@@ -4053,7 +4059,7 @@ static int tcp_ack(struct sock *sk, cons
+@@ -4059,7 +4065,7 @@ static int tcp_ack(struct sock *sk, cons
  	tcp_rack_update_reo_wnd(sk, &rs);
  
  	if (tp->tlp_high_seq)
@@ -62,7 +62,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  	if (tcp_ack_is_dubious(sk, flag)) {
  		if (!(flag & (FLAG_SND_UNA_ADVANCED |
-@@ -4097,7 +4103,7 @@ no_queue:
+@@ -4103,7 +4109,7 @@ no_queue:
  	tcp_ack_probe(sk);
  
  	if (tp->tlp_high_seq)

debian/patches/misc-bbr3/0015-tcp-introduce-per-route-feature-RTAX_FEATURE_ECN_LOW.patch

@@ -1,4 +1,4 @@
-From 38dd25482f815d949fec91edd7694b2f15823f67 Mon Sep 17 00:00:00 2001
+From 5e219e6228cb7b13a7d9a1d05c6e4846363fd6fe Mon Sep 17 00:00:00 2001
 From: David Morley <morleyd@google.com>
 Date: Fri, 14 Jul 2023 11:07:56 -0400
 Subject: [PATCH 15/19] tcp: introduce per-route feature RTAX_FEATURE_ECN_LOW
@@ -33,7 +33,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -375,6 +375,7 @@ static inline void tcp_dec_quickack_mode
+@@ -376,6 +376,7 @@ static inline void tcp_dec_quickack_mode
  #define	TCP_ECN_QUEUE_CWR	2
  #define	TCP_ECN_DEMAND_CWR	4
  #define	TCP_ECN_SEEN		8
@@ -41,7 +41,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
  enum tcp_tw_status {
  	TCP_TW_SUCCESS = 0,
-@@ -777,6 +778,15 @@ static inline void tcp_fast_path_check(s
+@@ -794,6 +795,15 @@ static inline void tcp_fast_path_check(s
  		tcp_fast_path_on(tp);
  }
  
@@ -77,7 +77,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  	__u8	proto;
 --- a/net/ipv4/tcp_minisocks.c
 +++ b/net/ipv4/tcp_minisocks.c
-@@ -459,6 +459,8 @@ void tcp_ca_openreq_child(struct sock *s
+@@ -462,6 +462,8 @@ void tcp_ca_openreq_child(struct sock *s
  	u32 ca_key = dst_metric(dst, RTAX_CC_ALGO);
  	bool ca_got_dst = false;
  
@@ -88,7 +88,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -336,10 +336,9 @@ static void tcp_ecn_send_syn(struct sock
+@@ -339,10 +339,9 @@ static void tcp_ecn_send_syn(struct sock
  	bool bpf_needs_ecn = tcp_bpf_ca_needs_ecn(sk);
  	bool use_ecn = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_ecn) == 1 ||
  		tcp_ca_needs_ecn(sk) || bpf_needs_ecn;
@@ -100,7 +100,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  		if (dst && dst_feature(dst, RTAX_FEATURE_ECN))
  			use_ecn = true;
  	}
-@@ -351,6 +350,9 @@ static void tcp_ecn_send_syn(struct sock
+@@ -354,6 +353,9 @@ static void tcp_ecn_send_syn(struct sock
  		tp->ecn_flags = TCP_ECN_OK;
  		if (tcp_ca_needs_ecn(sk) || bpf_needs_ecn)
  			INET_ECN_xmit(sk);

debian/patches/misc-bbr3/0016-net-tcp_bbr-v3-update-TCP-bbr-congestion-control-mod.patch

@@ -1,4 +1,4 @@
-From 6e06d157aa50e3288c749919a81f04ec792d2d91 Mon Sep 17 00:00:00 2001
+From de7a1729144df5a664b32643fc2246da8021e01c Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Tue, 11 Jun 2019 12:54:22 -0400
 Subject: [PATCH 16/19] net-tcp_bbr: v3: update TCP "bbr" congestion control
@@ -153,7 +153,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  #define ICSK_TIME_RETRANS	1	/* Retransmit timer */
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -2473,7 +2473,7 @@ struct tcp_plb_state {
+@@ -2491,7 +2491,7 @@ struct tcp_plb_state {
  	u8	consec_cong_rounds:5, /* consecutive congested rounds */
  		unused:3;
  	u32	pause_until; /* jiffies32 when PLB can resume rerouting */
@@ -196,7 +196,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  union tcp_cc_info {
 --- a/net/ipv4/Kconfig
 +++ b/net/ipv4/Kconfig
-@@ -668,15 +668,18 @@ config TCP_CONG_BBR
+@@ -669,15 +669,18 @@ config TCP_CONG_BBR
  	default n
  	help
  

debian/patches/misc-bbr3/0017-net-tcp_bbr-v3-ensure-ECN-enabled-BBR-flows-set-ECT-.patch

@@ -1,4 +1,4 @@
-From 99e86f904f246ae9ec7a13d1b920eaf4a8c2d47b Mon Sep 17 00:00:00 2001
+From 8a87d0d851b9c06455a2def28fa8c2624ffa2e1a Mon Sep 17 00:00:00 2001
 From: Adithya Abraham Philip <abrahamphilip@google.com>
 Date: Fri, 11 Jun 2021 21:56:10 +0000
 Subject: [PATCH 17/19] net-tcp_bbr: v3: ensure ECN-enabled BBR flows set ECT
@@ -25,7 +25,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -376,6 +376,7 @@ static inline void tcp_dec_quickack_mode
+@@ -377,6 +377,7 @@ static inline void tcp_dec_quickack_mode
  #define	TCP_ECN_DEMAND_CWR	4
  #define	TCP_ECN_SEEN		8
  #define	TCP_ECN_LOW		16
@@ -47,7 +47,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  /* BBR marks the current round trip as a loss round. */
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -390,7 +390,8 @@ static void tcp_ecn_send(struct sock *sk
+@@ -393,7 +393,8 @@ static void tcp_ecn_send(struct sock *sk
  				th->cwr = 1;
  				skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
  			}

debian/patches/misc-bbr3/0018-tcp-export-TCPI_OPT_ECN_LOW-in-tcp_info-tcpi_options.patch

@@ -1,4 +1,4 @@
-From 5d7cb61552d374bcaaa95022129b4ca1eace1c33 Mon Sep 17 00:00:00 2001
+From 4cd6a6f7a76a9acd5acc590dfbde3b1386a9e11e Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sun, 23 Jul 2023 23:25:34 -0400
 Subject: [PATCH 18/19] tcp: export TCPI_OPT_ECN_LOW in tcp_info tcpi_options
@@ -27,7 +27,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
   * Sender's congestion state indicating normal or abnormal situations
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
-@@ -3850,6 +3850,8 @@ void tcp_get_info(struct sock *sk, struc
+@@ -4124,6 +4124,8 @@ void tcp_get_info(struct sock *sk, struc
  		info->tcpi_options |= TCPI_OPT_ECN;
  	if (tp->ecn_flags & TCP_ECN_SEEN)
  		info->tcpi_options |= TCPI_OPT_ECN_SEEN;

debian/patches/misc-bbr3/0019-x86-cfi-bpf-Add-tso_segs-and-skb_marked_lost-to-bpf_.patch

@@ -1,4 +1,4 @@
-From 39838c2f0b09bec02004c092904aada85da2bc2e Mon Sep 17 00:00:00 2001
+From d53b209e5fcee3b3c53c30a4cc4fcc8e392a8fce Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Mon, 11 Mar 2024 12:01:13 -0300
 Subject: [PATCH 19/19] x86/cfi,bpf: Add tso_segs and skb_marked_lost to
@@ -13,7 +13,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/net/ipv4/bpf_tcp_ca.c
 +++ b/net/ipv4/bpf_tcp_ca.c
-@@ -305,11 +305,15 @@ static void bpf_tcp_ca_pkts_acked(struct
+@@ -280,11 +280,15 @@ static void bpf_tcp_ca_pkts_acked(struct
  {
  }
  
@@ -30,7 +30,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
  static void bpf_tcp_ca_cong_control(struct sock *sk, u32 ack, int flag,
  				    const struct rate_sample *rs)
  {
-@@ -340,7 +344,8 @@ static struct tcp_congestion_ops __bpf_o
+@@ -315,7 +319,8 @@ static struct tcp_congestion_ops __bpf_o
  	.cwnd_event = bpf_tcp_ca_cwnd_event,
  	.in_ack_event = bpf_tcp_ca_in_ack_event,
  	.pkts_acked = bpf_tcp_ca_pkts_acked,

debian/patches/misc-ntsync5/0016-Revert-misc-ntsync-mark-driver-as-broken-to-prevent-.patch

@@ -1,21 +0,0 @@
-From 06bc88f16094c6f38e0890992af4a32415716c5d Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Thu, 18 Jul 2024 21:19:39 +0200
-Subject: Revert "misc: ntsync: mark driver as "broken" to prevent from
- building"
-
-This reverts commit f5b335dc025cfee90957efa90dc72fada0d5abb4.
----
- drivers/misc/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -507,7 +507,6 @@ config OPEN_DICE
- 
- config NTSYNC
- 	tristate "NT synchronization primitive emulation"
--	depends on BROKEN
- 	help
- 	  This module provides kernel support for emulation of Windows NT
- 	  synchronization primitives. It is not a hardware driver.

debian/patches/misc-ntsync7/0001-ntsync-Return-the-fd-from-NTSYNC_IOC_CREATE_SEM.patch

@@ -0,0 +1,55 @@
+From e50ffd43b88d64b8063a9fce59f1d03b56f6144c Mon Sep 17 00:00:00 2001
+From: Elizabeth Figura <zfigura@codeweavers.com>
+Date: Fri, 13 Dec 2024 13:34:42 -0600
+Subject: ntsync: Return the fd from NTSYNC_IOC_CREATE_SEM.
+
+Simplify the user API a bit by returning the fd as return value from the ioctl
+instead of through the argument pointer.
+
+Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
+---
+ drivers/misc/ntsync.c       | 7 ++-----
+ include/uapi/linux/ntsync.h | 3 +--
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+--- a/drivers/misc/ntsync.c
++++ b/drivers/misc/ntsync.c
+@@ -165,7 +165,6 @@ static int ntsync_obj_get_fd(struct ntsy
+ 
+ static int ntsync_create_sem(struct ntsync_device *dev, void __user *argp)
+ {
+-	struct ntsync_sem_args __user *user_args = argp;
+ 	struct ntsync_sem_args args;
+ 	struct ntsync_obj *sem;
+ 	int fd;
+@@ -182,12 +181,10 @@ static int ntsync_create_sem(struct ntsy
+ 	sem->u.sem.count = args.count;
+ 	sem->u.sem.max = args.max;
+ 	fd = ntsync_obj_get_fd(sem);
+-	if (fd < 0) {
++	if (fd < 0)
+ 		kfree(sem);
+-		return fd;
+-	}
+ 
+-	return put_user(fd, &user_args->sem);
++	return fd;
+ }
+ 
+ static int ntsync_char_open(struct inode *inode, struct file *file)
+--- a/include/uapi/linux/ntsync.h
++++ b/include/uapi/linux/ntsync.h
+@@ -11,12 +11,11 @@
+ #include <linux/types.h>
+ 
+ struct ntsync_sem_args {
+-	__u32 sem;
+ 	__u32 count;
+ 	__u32 max;
+ };
+ 
+-#define NTSYNC_IOC_CREATE_SEM		_IOWR('N', 0x80, struct ntsync_sem_args)
++#define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
+ 
+ #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ 

debian/patches/misc-ntsync7/0002-ntsync-Rename-NTSYNC_IOC_SEM_POST-to-NTSYNC_IOC_SEM_.patch

@@ -0,0 +1,64 @@
+From 160e9bf7826da868ae4de261753a03cce2208ff6 Mon Sep 17 00:00:00 2001
+From: Elizabeth Figura <zfigura@codeweavers.com>
+Date: Fri, 13 Dec 2024 13:34:43 -0600
+Subject: ntsync: Rename NTSYNC_IOC_SEM_POST to NTSYNC_IOC_SEM_RELEASE.
+
+Use the more common "release" terminology, which is also the term used by NT,
+instead of "post" (which is used by POSIX).
+
+Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
+---
+ drivers/misc/ntsync.c       | 10 +++++-----
+ include/uapi/linux/ntsync.h |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/misc/ntsync.c
++++ b/drivers/misc/ntsync.c
+@@ -57,7 +57,7 @@ struct ntsync_device {
+  * Actually change the semaphore state, returning -EOVERFLOW if it is made
+  * invalid.
+  */
+-static int post_sem_state(struct ntsync_obj *sem, __u32 count)
++static int release_sem_state(struct ntsync_obj *sem, __u32 count)
+ {
+ 	__u32 sum;
+ 
+@@ -71,7 +71,7 @@ static int post_sem_state(struct ntsync_
+ 	return 0;
+ }
+ 
+-static int ntsync_sem_post(struct ntsync_obj *sem, void __user *argp)
++static int ntsync_sem_release(struct ntsync_obj *sem, void __user *argp)
+ {
+ 	__u32 __user *user_args = argp;
+ 	__u32 prev_count;
+@@ -87,7 +87,7 @@ static int ntsync_sem_post(struct ntsync
+ 	spin_lock(&sem->lock);
+ 
+ 	prev_count = sem->u.sem.count;
+-	ret = post_sem_state(sem, args);
++	ret = release_sem_state(sem, args);
+ 
+ 	spin_unlock(&sem->lock);
+ 
+@@ -114,8 +114,8 @@ static long ntsync_obj_ioctl(struct file
+ 	void __user *argp = (void __user *)parm;
+ 
+ 	switch (cmd) {
+-	case NTSYNC_IOC_SEM_POST:
+-		return ntsync_sem_post(obj, argp);
++	case NTSYNC_IOC_SEM_RELEASE:
++		return ntsync_sem_release(obj, argp);
+ 	default:
+ 		return -ENOIOCTLCMD;
+ 	}
+--- a/include/uapi/linux/ntsync.h
++++ b/include/uapi/linux/ntsync.h
+@@ -17,6 +17,6 @@ struct ntsync_sem_args {
+ 
+ #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
+ 
+-#define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
++#define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
+ 
+ #endif

debian/patches/misc-ntsync7/0003-ntsync-Introduce-NTSYNC_IOC_WAIT_ANY.patch

@@ -1,6 +1,6 @@
-From 60b01019526236e40466cf20bf1192074e5e1a7c Mon Sep 17 00:00:00 2001
+From e855a17ec837cdee9047e6e23e47ed7b4312a265 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:27 -0500
+Date: Fri, 13 Dec 2024 13:34:44 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_WAIT_ANY.
 
 This corresponds to part of the functionality of the NT syscall
@@ -38,9 +38,9 @@ in future patches (split out to ease review).
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 245 ++++++++++++++++++++++++++++++++++++
+ drivers/misc/ntsync.c       | 247 +++++++++++++++++++++++++++++++++++-
- include/uapi/linux/ntsync.h |  14 +++
+ include/uapi/linux/ntsync.h |  14 ++
- 2 files changed, 259 insertions(+)
+ 2 files changed, 260 insertions(+), 1 deletion(-)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
@@ -126,16 +126,18 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  /*
   * Actually change the semaphore state, returning -EOVERFLOW if it is made
   * invalid.
-@@ -88,6 +138,8 @@ static int ntsync_sem_post(struct ntsync
+@@ -87,7 +137,9 @@ static int ntsync_sem_release(struct nts
+ 	spin_lock(&sem->lock);
  
  	prev_count = sem->u.sem.count;
- 	ret = post_sem_state(sem, args);
+-	ret = release_sem_state(sem, args);
++	ret = post_sem_state(sem, args);
 +	if (!ret)
 +		try_wake_any_sem(sem);
  
  	spin_unlock(&sem->lock);
  
-@@ -141,6 +193,7 @@ static struct ntsync_obj *ntsync_alloc_o
+@@ -140,6 +192,7 @@ static struct ntsync_obj *ntsync_alloc_o
  	obj->dev = dev;
  	get_file(dev->file);
  	spin_lock_init(&obj->lock);
@@ -143,8 +145,8 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	return obj;
  }
-@@ -191,6 +244,196 @@ static int ntsync_create_sem(struct ntsy
+@@ -187,6 +240,196 @@ static int ntsync_create_sem(struct ntsy
- 	return put_user(fd, &user_args->sem);
+ 	return fd;
  }
  
 +static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
@@ -340,7 +342,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  static int ntsync_char_open(struct inode *inode, struct file *file)
  {
  	struct ntsync_device *dev;
-@@ -222,6 +465,8 @@ static long ntsync_char_ioctl(struct fil
+@@ -218,6 +461,8 @@ static long ntsync_char_ioctl(struct fil
  	switch (cmd) {
  	case NTSYNC_IOC_CREATE_SEM:
  		return ntsync_create_sem(dev, argp);
@@ -351,7 +353,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -16,7 +16,21 @@ struct ntsync_sem_args {
+@@ -15,7 +15,21 @@ struct ntsync_sem_args {
  	__u32 max;
  };
  
@@ -368,8 +370,8 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +#define NTSYNC_MAX_WAIT_COUNT 64
 +
- #define NTSYNC_IOC_CREATE_SEM		_IOWR('N', 0x80, struct ntsync_sem_args)
+ #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
 +#define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  

debian/patches/misc-ntsync7/0004-ntsync-Introduce-NTSYNC_IOC_WAIT_ALL.patch

@@ -1,6 +1,6 @@
-From 73fc33606fcb7028ec1ee6027a361de4e85ab5d6 Mon Sep 17 00:00:00 2001
+From 6c1dac87ff835a48a067fe75bd0a6965921dac78 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:28 -0500
+Date: Fri, 13 Dec 2024 13:34:45 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_WAIT_ALL.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -27,9 +27,9 @@ The locking scheme used here was written by Peter Zijlstra.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 334 ++++++++++++++++++++++++++++++++++--
+ drivers/misc/ntsync.c       | 336 ++++++++++++++++++++++++++++++++++--
  include/uapi/linux/ntsync.h |   1 +
- 2 files changed, 322 insertions(+), 13 deletions(-)
+ 2 files changed, 323 insertions(+), 14 deletions(-)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
@@ -280,7 +280,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	list_for_each_entry(entry, &sem->any_waiters, node) {
  		struct ntsync_q *q = entry->q;
-@@ -111,7 +315,7 @@ static int post_sem_state(struct ntsync_
+@@ -111,7 +315,7 @@ static int release_sem_state(struct ntsy
  {
  	__u32 sum;
  
@@ -289,9 +289,9 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	if (check_add_overflow(sem->u.sem.count, count, &sum) ||
  	    sum > sem->u.sem.max)
-@@ -123,9 +327,11 @@ static int post_sem_state(struct ntsync_
+@@ -123,9 +327,11 @@ static int release_sem_state(struct ntsy
  
- static int ntsync_sem_post(struct ntsync_obj *sem, void __user *argp)
+ static int ntsync_sem_release(struct ntsync_obj *sem, void __user *argp)
  {
 +	struct ntsync_device *dev = sem->dev;
  	__u32 __user *user_args = argp;
@@ -301,7 +301,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	int ret;
  
  	if (copy_from_user(&args, argp, sizeof(args)))
-@@ -134,14 +340,17 @@ static int ntsync_sem_post(struct ntsync
+@@ -134,14 +340,17 @@ static int ntsync_sem_release(struct nts
  	if (sem->type != NTSYNC_TYPE_SEM)
  		return -EINVAL;
  
@@ -309,8 +309,9 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	all = ntsync_lock_obj(dev, sem);
  
  	prev_count = sem->u.sem.count;
- 	ret = post_sem_state(sem, args);
+-	ret = post_sem_state(sem, args);
 -	if (!ret)
++	ret = release_sem_state(sem, args);
 +	if (!ret) {
 +		if (all)
 +			try_wake_all_obj(dev, sem);
@@ -322,7 +323,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	if (!ret && put_user(prev_count, user_args))
  		ret = -EFAULT;
-@@ -194,6 +403,8 @@ static struct ntsync_obj *ntsync_alloc_o
+@@ -193,6 +402,8 @@ static struct ntsync_obj *ntsync_alloc_o
  	get_file(dev->file);
  	spin_lock_init(&obj->lock);
  	INIT_LIST_HEAD(&obj->any_waiters);
@@ -331,7 +332,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	return obj;
  }
-@@ -305,7 +516,7 @@ static int ntsync_schedule(const struct
+@@ -301,7 +512,7 @@ static int ntsync_schedule(const struct
   * Allocate and initialize the ntsync_q structure, but do not queue us yet.
   */
  static int setup_wait(struct ntsync_device *dev,
@@ -340,7 +341,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		      struct ntsync_q **ret_q)
  {
  	const __u32 count = args->count;
-@@ -328,6 +539,7 @@ static int setup_wait(struct ntsync_devi
+@@ -324,6 +535,7 @@ static int setup_wait(struct ntsync_devi
  		return -ENOMEM;
  	q->task = current;
  	atomic_set(&q->signaled, -1);
@@ -348,7 +349,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	q->count = count;
  
  	for (i = 0; i < count; i++) {
-@@ -337,6 +549,16 @@ static int setup_wait(struct ntsync_devi
+@@ -333,6 +545,16 @@ static int setup_wait(struct ntsync_devi
  		if (!obj)
  			goto err;
  
@@ -365,7 +366,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		entry->obj = obj;
  		entry->q = q;
  		entry->index = i;
-@@ -366,13 +588,14 @@ static int ntsync_wait_any(struct ntsync
+@@ -362,13 +584,14 @@ static int ntsync_wait_any(struct ntsync
  	struct ntsync_wait_args args;
  	struct ntsync_q *q;
  	int signaled;
@@ -381,7 +382,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	if (ret < 0)
  		return ret;
  
-@@ -382,9 +605,9 @@ static int ntsync_wait_any(struct ntsync
+@@ -378,9 +601,9 @@ static int ntsync_wait_any(struct ntsync
  		struct ntsync_q_entry *entry = &q->entries[i];
  		struct ntsync_obj *obj = entry->obj;
  
@@ -393,7 +394,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
  
  	/* check if we are already signaled */
-@@ -395,9 +618,9 @@ static int ntsync_wait_any(struct ntsync
+@@ -391,9 +614,9 @@ static int ntsync_wait_any(struct ntsync
  		if (atomic_read(&q->signaled) != -1)
  			break;
  
@@ -405,7 +406,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
  
  	/* sleep */
-@@ -410,13 +633,94 @@ static int ntsync_wait_any(struct ntsync
+@@ -406,13 +629,94 @@ static int ntsync_wait_any(struct ntsync
  		struct ntsync_q_entry *entry = &q->entries[i];
  		struct ntsync_obj *obj = entry->obj;
  
@@ -502,7 +503,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	signaled = atomic_read(&q->signaled);
  	if (signaled != -1) {
  		struct ntsync_wait_args __user *user_args = argp;
-@@ -442,6 +746,8 @@ static int ntsync_char_open(struct inode
+@@ -438,6 +742,8 @@ static int ntsync_char_open(struct inode
  	if (!dev)
  		return -ENOMEM;
  
@@ -511,7 +512,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	file->private_data = dev;
  	dev->file = file;
  	return nonseekable_open(inode, file);
-@@ -465,6 +771,8 @@ static long ntsync_char_ioctl(struct fil
+@@ -461,6 +767,8 @@ static long ntsync_char_ioctl(struct fil
  	switch (cmd) {
  	case NTSYNC_IOC_CREATE_SEM:
  		return ntsync_create_sem(dev, argp);
@@ -522,11 +523,11 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	default:
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -31,6 +31,7 @@ struct ntsync_wait_args {
+@@ -30,6 +30,7 @@ struct ntsync_wait_args {
  
- #define NTSYNC_IOC_CREATE_SEM		_IOWR('N', 0x80, struct ntsync_sem_args)
+ #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
  #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
 +#define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  

debian/patches/misc-ntsync7/0005-ntsync-Introduce-NTSYNC_IOC_CREATE_MUTEX.patch

@@ -1,6 +1,6 @@
-From fdeceab49078a80987c665ed837ee4f1b8a942a8 Mon Sep 17 00:00:00 2001
+From bcdeaefdc4b60e7845232c201427717df3a83277 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:29 -0500
+Date: Fri, 13 Dec 2024 13:34:46 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX.
 
 This corresponds to the NT syscall NtCreateMutant().
@@ -18,9 +18,9 @@ created.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 77 +++++++++++++++++++++++++++++++++++--
+ drivers/misc/ntsync.c       | 74 +++++++++++++++++++++++++++++++++++--
- include/uapi/linux/ntsync.h | 10 ++++-
+ include/uapi/linux/ntsync.h |  9 ++++-
- 2 files changed, 83 insertions(+), 4 deletions(-)
+ 2 files changed, 79 insertions(+), 4 deletions(-)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
@@ -121,13 +121,12 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  /*
   * Actually change the semaphore state, returning -EOVERFLOW if it is made
   * invalid.
-@@ -455,6 +493,33 @@ static int ntsync_create_sem(struct ntsy
+@@ -451,6 +489,30 @@ static int ntsync_create_sem(struct ntsy
- 	return put_user(fd, &user_args->sem);
+ 	return fd;
  }
  
 +static int ntsync_create_mutex(struct ntsync_device *dev, void __user *argp)
 +{
-+	struct ntsync_mutex_args __user *user_args = argp;
 +	struct ntsync_mutex_args args;
 +	struct ntsync_obj *mutex;
 +	int fd;
@@ -144,18 +143,16 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	mutex->u.mutex.count = args.count;
 +	mutex->u.mutex.owner = args.owner;
 +	fd = ntsync_obj_get_fd(mutex);
-+	if (fd < 0) {
++	if (fd < 0)
 +		kfree(mutex);
-+		return fd;
-+	}
 +
-+	return put_user(fd, &user_args->mutex);
++	return fd;
 +}
 +
  static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
  {
  	struct file *file = fget(fd);
-@@ -524,7 +589,7 @@ static int setup_wait(struct ntsync_devi
+@@ -520,7 +582,7 @@ static int setup_wait(struct ntsync_devi
  	struct ntsync_q *q;
  	__u32 i, j;
  
@@ -164,7 +161,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		return -EINVAL;
  
  	if (args->count > NTSYNC_MAX_WAIT_COUNT)
-@@ -538,6 +603,7 @@ static int setup_wait(struct ntsync_devi
+@@ -534,6 +596,7 @@ static int setup_wait(struct ntsync_devi
  	if (!q)
  		return -ENOMEM;
  	q->task = current;
@@ -172,7 +169,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	atomic_set(&q->signaled, -1);
  	q->all = all;
  	q->count = count;
-@@ -580,6 +646,9 @@ static void try_wake_any_obj(struct ntsy
+@@ -576,6 +639,9 @@ static void try_wake_any_obj(struct ntsy
  	case NTSYNC_TYPE_SEM:
  		try_wake_any_sem(obj);
  		break;
@@ -182,7 +179,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
  }
  
-@@ -769,6 +838,8 @@ static long ntsync_char_ioctl(struct fil
+@@ -765,6 +831,8 @@ static long ntsync_char_ioctl(struct fil
  	void __user *argp = (void __user *)parm;
  
  	switch (cmd) {
@@ -193,12 +190,11 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	case NTSYNC_IOC_WAIT_ALL:
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -16,6 +16,12 @@ struct ntsync_sem_args {
+@@ -15,6 +15,11 @@ struct ntsync_sem_args {
  	__u32 max;
  };
  
 +struct ntsync_mutex_args {
-+	__u32 mutex;
 +	__u32 owner;
 +	__u32 count;
 +};
@@ -206,7 +202,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  #define NTSYNC_WAIT_REALTIME	0x1
  
  struct ntsync_wait_args {
-@@ -24,7 +30,8 @@ struct ntsync_wait_args {
+@@ -23,7 +28,8 @@ struct ntsync_wait_args {
  	__u32 count;
  	__u32 index;
  	__u32 flags;
@@ -216,11 +212,11 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  };
  
  #define NTSYNC_MAX_WAIT_COUNT 64
-@@ -32,6 +39,7 @@ struct ntsync_wait_args {
+@@ -31,6 +37,7 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_CREATE_SEM		_IOWR('N', 0x80, struct ntsync_sem_args)
+ #define NTSYNC_IOC_CREATE_SEM		_IOW ('N', 0x80, struct ntsync_sem_args)
  #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
  #define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
-+#define NTSYNC_IOC_CREATE_MUTEX		_IOWR('N', 0x84, struct ntsync_sem_args)
++#define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  

debian/patches/misc-ntsync7/0006-ntsync-Introduce-NTSYNC_IOC_MUTEX_UNLOCK.patch

@@ -1,6 +1,6 @@
-From cc9ade623cd90cd002fb86f3aa249af2e6e4019e Mon Sep 17 00:00:00 2001
+From e349279c9dc7fc2136a764a16074a90ef3039f38 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:30 -0500
+Date: Fri, 13 Dec 2024 13:34:47 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK.
 
 This corresponds to the NT syscall NtReleaseMutant().
@@ -17,7 +17,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
-@@ -396,6 +396,57 @@ static int ntsync_sem_post(struct ntsync
+@@ -396,6 +396,57 @@ static int ntsync_sem_release(struct nts
  	return ret;
  }
  
@@ -77,8 +77,8 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	struct ntsync_obj *obj = file->private_data;
 @@ -415,6 +466,8 @@ static long ntsync_obj_ioctl(struct file
  	switch (cmd) {
- 	case NTSYNC_IOC_SEM_POST:
+ 	case NTSYNC_IOC_SEM_RELEASE:
- 		return ntsync_sem_post(obj, argp);
+ 		return ntsync_sem_release(obj, argp);
 +	case NTSYNC_IOC_MUTEX_UNLOCK:
 +		return ntsync_mutex_unlock(obj, argp);
  	default:
@@ -86,10 +86,10 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -42,5 +42,6 @@ struct ntsync_wait_args {
+@@ -40,5 +40,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_CREATE_MUTEX		_IOWR('N', 0x84, struct ntsync_sem_args)
+ #define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
 +#define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
  
  #endif

debian/patches/misc-ntsync7/0007-ntsync-Introduce-NTSYNC_IOC_MUTEX_KILL.patch

@@ -1,6 +1,6 @@
-From dca3fe766afa42e34f5d3f62c0f2850760663176 Mon Sep 17 00:00:00 2001
+From ebb60a10ac3c6b28ba7a46aa67b279d41ad9356d Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:31 -0500
+Date: Fri, 13 Dec 2024 13:34:48 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_KILL.
 
 This does not correspond to any NT syscall. Rather, when a thread dies, it
@@ -111,7 +111,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  {
  	struct ntsync_obj *obj = file->private_data;
 @@ -468,6 +522,8 @@ static long ntsync_obj_ioctl(struct file
- 		return ntsync_sem_post(obj, argp);
+ 		return ntsync_sem_release(obj, argp);
  	case NTSYNC_IOC_MUTEX_UNLOCK:
  		return ntsync_mutex_unlock(obj, argp);
 +	case NTSYNC_IOC_MUTEX_KILL:
@@ -119,7 +119,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	default:
  		return -ENOIOCTLCMD;
  	}
-@@ -659,6 +715,7 @@ static int setup_wait(struct ntsync_devi
+@@ -652,6 +708,7 @@ static int setup_wait(struct ntsync_devi
  	q->owner = args->owner;
  	atomic_set(&q->signaled, -1);
  	q->all = all;
@@ -127,7 +127,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	q->count = count;
  
  	for (i = 0; i < count; i++) {
-@@ -767,7 +824,7 @@ static int ntsync_wait_any(struct ntsync
+@@ -760,7 +817,7 @@ static int ntsync_wait_any(struct ntsync
  		struct ntsync_wait_args __user *user_args = argp;
  
  		/* even if we caught a signal, we need to communicate success */
@@ -136,7 +136,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  		if (put_user(signaled, &user_args->index))
  			ret = -EFAULT;
-@@ -848,7 +905,7 @@ static int ntsync_wait_all(struct ntsync
+@@ -841,7 +898,7 @@ static int ntsync_wait_all(struct ntsync
  		struct ntsync_wait_args __user *user_args = argp;
  
  		/* even if we caught a signal, we need to communicate success */
@@ -147,9 +147,9 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  			ret = -EFAULT;
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -43,5 +43,6 @@ struct ntsync_wait_args {
+@@ -41,5 +41,6 @@ struct ntsync_wait_args {
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
 +#define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
  

debian/patches/misc-ntsync7/0008-ntsync-Introduce-NTSYNC_IOC_CREATE_EVENT.patch

@@ -1,6 +1,6 @@
-From 3f3bbc85f1e613364261d685b8197c32ffdeaad0 Mon Sep 17 00:00:00 2001
+From f74c8259d49ea4c0e679902da9c7c95ec06ae65c Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:32 -0500
+Date: Fri, 13 Dec 2024 13:34:49 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_CREATE_EVENT.
 
 This correspond to the NT syscall NtCreateEvent().
@@ -17,9 +17,9 @@ creation time.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 62 +++++++++++++++++++++++++++++++++++++
+ drivers/misc/ntsync.c       | 59 +++++++++++++++++++++++++++++++++++++
- include/uapi/linux/ntsync.h |  7 +++++
+ include/uapi/linux/ntsync.h |  6 ++++
- 2 files changed, 69 insertions(+)
+ 2 files changed, 65 insertions(+)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
@@ -91,13 +91,12 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  /*
   * Actually change the semaphore state, returning -EOVERFLOW if it is made
   * invalid.
-@@ -629,6 +662,30 @@ static int ntsync_create_mutex(struct nt
+@@ -622,6 +655,27 @@ static int ntsync_create_mutex(struct nt
- 	return put_user(fd, &user_args->mutex);
+ 	return fd;
  }
  
 +static int ntsync_create_event(struct ntsync_device *dev, void __user *argp)
 +{
-+	struct ntsync_event_args __user *user_args = argp;
 +	struct ntsync_event_args args;
 +	struct ntsync_obj *event;
 +	int fd;
@@ -111,18 +110,16 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	event->u.event.manual = args.manual;
 +	event->u.event.signaled = args.signaled;
 +	fd = ntsync_obj_get_fd(event);
-+	if (fd < 0) {
++	if (fd < 0)
 +		kfree(event);
-+		return fd;
-+	}
 +
-+	return put_user(fd, &user_args->event);
++	return fd;
 +}
 +
  static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
  {
  	struct file *file = fget(fd);
-@@ -759,6 +816,9 @@ static void try_wake_any_obj(struct ntsy
+@@ -752,6 +806,9 @@ static void try_wake_any_obj(struct ntsy
  	case NTSYNC_TYPE_MUTEX:
  		try_wake_any_mutex(obj);
  		break;
@@ -132,7 +129,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
  }
  
-@@ -948,6 +1008,8 @@ static long ntsync_char_ioctl(struct fil
+@@ -941,6 +998,8 @@ static long ntsync_char_ioctl(struct fil
  	void __user *argp = (void __user *)parm;
  
  	switch (cmd) {
@@ -143,12 +140,11 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	case NTSYNC_IOC_CREATE_SEM:
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -22,6 +22,12 @@ struct ntsync_mutex_args {
+@@ -20,6 +20,11 @@ struct ntsync_mutex_args {
  	__u32 count;
  };
  
 +struct ntsync_event_args {
-+	__u32 event;
 +	__u32 manual;
 +	__u32 signaled;
 +};
@@ -156,11 +152,11 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  #define NTSYNC_WAIT_REALTIME	0x1
  
  struct ntsync_wait_args {
-@@ -40,6 +46,7 @@ struct ntsync_wait_args {
+@@ -38,6 +43,7 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_WAIT_ANY		_IOWR('N', 0x82, struct ntsync_wait_args)
  #define NTSYNC_IOC_WAIT_ALL		_IOWR('N', 0x83, struct ntsync_wait_args)
- #define NTSYNC_IOC_CREATE_MUTEX		_IOWR('N', 0x84, struct ntsync_sem_args)
+ #define NTSYNC_IOC_CREATE_MUTEX		_IOW ('N', 0x84, struct ntsync_mutex_args)
-+#define NTSYNC_IOC_CREATE_EVENT		_IOWR('N', 0x87, struct ntsync_event_args)
++#define NTSYNC_IOC_CREATE_EVENT		_IOW ('N', 0x87, struct ntsync_event_args)
  
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)

debian/patches/misc-ntsync7/0009-ntsync-Introduce-NTSYNC_IOC_EVENT_SET.patch

@@ -1,6 +1,6 @@
-From a6f107f17a976008b85c3e269bf4196e595d3f52 Mon Sep 17 00:00:00 2001
+From bf60db9cfeccc8f92636b6dcf2eccd7fcd8d84f3 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:33 -0500
+Date: Fri, 13 Dec 2024 13:34:50 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_EVENT_SET.
 
 This corresponds to the NT syscall NtSetEvent().
@@ -58,8 +58,8 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -51,5 +51,6 @@ struct ntsync_wait_args {
+@@ -48,5 +48,6 @@ struct ntsync_wait_args {
- #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+ #define NTSYNC_IOC_SEM_RELEASE		_IOWR('N', 0x81, __u32)
  #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
  #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
 +#define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)

debian/patches/misc-ntsync7/0010-ntsync-Introduce-NTSYNC_IOC_EVENT_RESET.patch

@@ -1,6 +1,6 @@
-From aa3ebb5870eb9ed259aba2ed4e07e9993e6cd978 Mon Sep 17 00:00:00 2001
+From f2de3c99a840cac45446515dd268cb9d64f9f892 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:34 -0500
+Date: Fri, 13 Dec 2024 13:34:51 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_EVENT_RESET.
 
 This corresponds to the NT syscall NtResetEvent().
@@ -55,7 +55,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -52,5 +52,6 @@ struct ntsync_wait_args {
+@@ -49,5 +49,6 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
  #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
  #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)

debian/patches/misc-ntsync7/0011-ntsync-Introduce-NTSYNC_IOC_EVENT_PULSE.patch

@@ -1,6 +1,6 @@
-From 99bca5d776a3011214041c42107a210fe315a35e Mon Sep 17 00:00:00 2001
+From 50c791dde217f9fdc1785de77fa2ae888d6bdb4e Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:35 -0500
+Date: Fri, 13 Dec 2024 13:34:52 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_EVENT_PULSE.
 
 This corresponds to the NT syscall NtPulseEvent().
@@ -51,7 +51,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -53,5 +53,6 @@ struct ntsync_wait_args {
+@@ -50,5 +50,6 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
  #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
  #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)

debian/patches/misc-ntsync7/0012-ntsync-Introduce-NTSYNC_IOC_SEM_READ.patch

@@ -1,6 +1,6 @@
-From 1ef0ea672662bd19e7c6a4eac1067d11e50844b2 Mon Sep 17 00:00:00 2001
+From 248013d9877d47dc5219344268c10b62de1f52f2 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:36 -0500
+Date: Fri, 13 Dec 2024 13:34:53 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_SEM_READ.
 
 This corresponds to the NT syscall NtQuerySemaphore().
@@ -9,13 +9,13 @@ This returns the current count and maximum count of the semaphore.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 26 ++++++++++++++++++++++++++
+ drivers/misc/ntsync.c       | 24 ++++++++++++++++++++++++
  include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 27 insertions(+)
+ 2 files changed, 25 insertions(+)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
-@@ -583,6 +583,30 @@ static int ntsync_event_reset(struct nts
+@@ -583,6 +583,28 @@ static int ntsync_event_reset(struct nts
  	return 0;
  }
  
@@ -29,8 +29,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	if (sem->type != NTSYNC_TYPE_SEM)
 +		return -EINVAL;
 +
-+	args.sem = 0;
-+
 +	all = ntsync_lock_obj(dev, sem);
 +
 +	args.count = sem->u.sem.count;
@@ -46,10 +44,10 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  static int ntsync_obj_release(struct inode *inode, struct file *file)
  {
  	struct ntsync_obj *obj = file->private_data;
-@@ -602,6 +626,8 @@ static long ntsync_obj_ioctl(struct file
+@@ -602,6 +624,8 @@ static long ntsync_obj_ioctl(struct file
  	switch (cmd) {
- 	case NTSYNC_IOC_SEM_POST:
+ 	case NTSYNC_IOC_SEM_RELEASE:
- 		return ntsync_sem_post(obj, argp);
+ 		return ntsync_sem_release(obj, argp);
 +	case NTSYNC_IOC_SEM_READ:
 +		return ntsync_sem_read(obj, argp);
  	case NTSYNC_IOC_MUTEX_UNLOCK:
@@ -57,7 +55,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	case NTSYNC_IOC_MUTEX_KILL:
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -54,5 +54,6 @@ struct ntsync_wait_args {
+@@ -51,5 +51,6 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
  #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
  #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)

debian/patches/misc-ntsync7/0013-ntsync-Introduce-NTSYNC_IOC_MUTEX_READ.patch

@@ -1,6 +1,6 @@
-From 7891b7d15abd12975aebb955821fbc43353b45d6 Mon Sep 17 00:00:00 2001
+From 8fc7a993fd8bc6b1a09b4b965bee7d16bb2156cc Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:37 -0500
+Date: Fri, 13 Dec 2024 13:34:54 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_MUTEX_READ.
 
 This corresponds to the NT syscall NtQueryMutant().
@@ -9,13 +9,13 @@ This returns the recursion count, owner, and abandoned state of the mutex.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 28 ++++++++++++++++++++++++++++
+ drivers/misc/ntsync.c       | 26 ++++++++++++++++++++++++++
  include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 29 insertions(+)
+ 2 files changed, 27 insertions(+)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
-@@ -607,6 +607,32 @@ static int ntsync_sem_read(struct ntsync
+@@ -605,6 +605,30 @@ static int ntsync_sem_read(struct ntsync
  	return 0;
  }
  
@@ -30,8 +30,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	if (mutex->type != NTSYNC_TYPE_MUTEX)
 +		return -EINVAL;
 +
-+	args.mutex = 0;
-+
 +	all = ntsync_lock_obj(dev, mutex);
 +
 +	args.count = mutex->u.mutex.count;
@@ -48,7 +46,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  static int ntsync_obj_release(struct inode *inode, struct file *file)
  {
  	struct ntsync_obj *obj = file->private_data;
-@@ -632,6 +658,8 @@ static long ntsync_obj_ioctl(struct file
+@@ -630,6 +654,8 @@ static long ntsync_obj_ioctl(struct file
  		return ntsync_mutex_unlock(obj, argp);
  	case NTSYNC_IOC_MUTEX_KILL:
  		return ntsync_mutex_kill(obj, argp);
@@ -59,7 +57,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	case NTSYNC_IOC_EVENT_RESET:
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -55,5 +55,6 @@ struct ntsync_wait_args {
+@@ -52,5 +52,6 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
  #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
  #define NTSYNC_IOC_SEM_READ		_IOR ('N', 0x8b, struct ntsync_sem_args)

debian/patches/misc-ntsync7/0014-ntsync-Introduce-NTSYNC_IOC_EVENT_READ.patch

@@ -1,6 +1,6 @@
-From 35ff252f99aa4002e0c2ecef37314a422969791b Mon Sep 17 00:00:00 2001
+From aed34cc9c28dba5e3735d7c59e1970a32eefc5f4 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:38 -0500
+Date: Fri, 13 Dec 2024 13:34:55 -0600
 Subject: ntsync: Introduce NTSYNC_IOC_EVENT_READ.
 
 This corresponds to the NT syscall NtQueryEvent().
@@ -9,13 +9,13 @@ This returns the signaled state of the event and whether it is manual-reset.
 
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
- drivers/misc/ntsync.c       | 26 ++++++++++++++++++++++++++
+ drivers/misc/ntsync.c       | 24 ++++++++++++++++++++++++
  include/uapi/linux/ntsync.h |  1 +
- 2 files changed, 27 insertions(+)
+ 2 files changed, 25 insertions(+)
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
-@@ -633,6 +633,30 @@ static int ntsync_mutex_read(struct ntsy
+@@ -629,6 +629,28 @@ static int ntsync_mutex_read(struct ntsy
  	return ret;
  }
  
@@ -29,8 +29,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +	if (event->type != NTSYNC_TYPE_EVENT)
 +		return -EINVAL;
 +
-+	args.event = 0;
-+
 +	all = ntsync_lock_obj(dev, event);
 +
 +	args.manual = event->u.event.manual;
@@ -46,7 +44,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  static int ntsync_obj_release(struct inode *inode, struct file *file)
  {
  	struct ntsync_obj *obj = file->private_data;
-@@ -666,6 +690,8 @@ static long ntsync_obj_ioctl(struct file
+@@ -662,6 +684,8 @@ static long ntsync_obj_ioctl(struct file
  		return ntsync_event_reset(obj, argp);
  	case NTSYNC_IOC_EVENT_PULSE:
  		return ntsync_event_set(obj, argp, true);
@@ -57,7 +55,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	}
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -56,5 +56,6 @@ struct ntsync_wait_args {
+@@ -53,5 +53,6 @@ struct ntsync_wait_args {
  #define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
  #define NTSYNC_IOC_SEM_READ		_IOR ('N', 0x8b, struct ntsync_sem_args)
  #define NTSYNC_IOC_MUTEX_READ		_IOR ('N', 0x8c, struct ntsync_mutex_args)

debian/patches/misc-ntsync7/0015-ntsync-Introduce-alertable-waits.patch

@@ -1,6 +1,6 @@
-From 2c391d57d1393cd46bf8bab08232ddc3dd32d5e5 Mon Sep 17 00:00:00 2001
+From 361a7fb848ba9cac87855cb68f9ab000ed1027be Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:39 -0500
+Date: Fri, 13 Dec 2024 13:34:56 -0600
 Subject: ntsync: Introduce alertable waits.
 
 NT waits can optionally be made "alertable". This is a special channel for
@@ -21,7 +21,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 
 --- a/drivers/misc/ntsync.c
 +++ b/drivers/misc/ntsync.c
-@@ -885,22 +885,29 @@ static int setup_wait(struct ntsync_devi
+@@ -869,22 +869,29 @@ static int setup_wait(struct ntsync_devi
  		      const struct ntsync_wait_args *args, bool all,
  		      struct ntsync_q **ret_q)
  {
@@ -54,7 +54,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	if (!q)
  		return -ENOMEM;
  	q->task = current;
-@@ -910,7 +917,7 @@ static int setup_wait(struct ntsync_devi
+@@ -894,7 +901,7 @@ static int setup_wait(struct ntsync_devi
  	q->ownerdead = false;
  	q->count = count;
  
@@ -63,7 +63,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		struct ntsync_q_entry *entry = &q->entries[i];
  		struct ntsync_obj *obj = get_obj(dev, fds[i]);
  
-@@ -960,10 +967,10 @@ static void try_wake_any_obj(struct ntsy
+@@ -944,10 +951,10 @@ static void try_wake_any_obj(struct ntsy
  static int ntsync_wait_any(struct ntsync_device *dev, void __user *argp)
  {
  	struct ntsync_wait_args args;
@@ -75,7 +75,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	int ret;
  
  	if (copy_from_user(&args, argp, sizeof(args)))
-@@ -973,9 +980,13 @@ static int ntsync_wait_any(struct ntsync
+@@ -957,9 +964,13 @@ static int ntsync_wait_any(struct ntsync
  	if (ret < 0)
  		return ret;
  
@@ -90,7 +90,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		struct ntsync_q_entry *entry = &q->entries[i];
  		struct ntsync_obj *obj = entry->obj;
  
-@@ -984,9 +995,15 @@ static int ntsync_wait_any(struct ntsync
+@@ -968,9 +979,15 @@ static int ntsync_wait_any(struct ntsync
  		ntsync_unlock_obj(dev, obj, all);
  	}
  
@@ -108,7 +108,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		struct ntsync_obj *obj = q->entries[i].obj;
  
  		if (atomic_read(&q->signaled) != -1)
-@@ -1003,7 +1020,7 @@ static int ntsync_wait_any(struct ntsync
+@@ -987,7 +1004,7 @@ static int ntsync_wait_any(struct ntsync
  
  	/* and finally, unqueue */
  
@@ -117,7 +117,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		struct ntsync_q_entry *entry = &q->entries[i];
  		struct ntsync_obj *obj = entry->obj;
  
-@@ -1063,6 +1080,14 @@ static int ntsync_wait_all(struct ntsync
+@@ -1047,6 +1064,14 @@ static int ntsync_wait_all(struct ntsync
  		 */
  		list_add_tail(&entry->node, &obj->all_waiters);
  	}
@@ -132,7 +132,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
  	/* check if we are already signaled */
  
-@@ -1070,6 +1095,21 @@ static int ntsync_wait_all(struct ntsync
+@@ -1054,6 +1079,21 @@ static int ntsync_wait_all(struct ntsync
  
  	mutex_unlock(&dev->wait_all_lock);
  
@@ -154,7 +154,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  	/* sleep */
  
  	ret = ntsync_schedule(q, &args);
-@@ -1095,6 +1135,18 @@ static int ntsync_wait_all(struct ntsync
+@@ -1079,6 +1119,18 @@ static int ntsync_wait_all(struct ntsync
  
  	mutex_unlock(&dev->wait_all_lock);
  
@@ -175,7 +175,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  		struct ntsync_wait_args __user *user_args = argp;
 --- a/include/uapi/linux/ntsync.h
 +++ b/include/uapi/linux/ntsync.h
-@@ -37,7 +37,8 @@ struct ntsync_wait_args {
+@@ -34,7 +34,8 @@ struct ntsync_wait_args {
  	__u32 index;
  	__u32 flags;
  	__u32 owner;

debian/patches/misc-ntsync7/0016-maintainers-Add-an-entry-for-ntsync.patch

@@ -1,6 +1,6 @@
-From 8d87043cd76368bb9996ba541d12e40cbb4201e5 Mon Sep 17 00:00:00 2001
+From b240b27e5348d38acbc4a12f1dc762dd1845f391 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:52 -0500
+Date: Fri, 13 Dec 2024 13:35:09 -0600
 Subject: maintainers: Add an entry for ntsync.
 
 Add myself as maintainer, supported by CodeWeavers.
@@ -12,7 +12,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -16319,6 +16319,15 @@ T:	git https://github.com/Paragon-Softwa
+@@ -16486,6 +16486,15 @@ T:	git https://github.com/Paragon-Softwa
  F:	Documentation/filesystems/ntfs3.rst
  F:	fs/ntfs3/
  

debian/patches/misc-ntsync7/0017-docs-ntsync-Add-documentation-for-the-ntsync-uAPI.patch

@@ -1,6 +1,6 @@
-From 4cb25d42d38f1e0b144b084674591b70afa60bb0 Mon Sep 17 00:00:00 2001
+From 733e310bb840117593a0eb4726fa63b34fea9cc3 Mon Sep 17 00:00:00 2001
 From: Elizabeth Figura <zfigura@codeweavers.com>
-Date: Sun, 19 May 2024 15:24:53 -0500
+Date: Fri, 13 Dec 2024 13:35:10 -0600
 Subject: docs: ntsync: Add documentation for the ntsync uAPI.
 
 Add an overall explanation of the driver architecture, and complete and precise
@@ -9,8 +9,8 @@ specification for its intended behaviour.
 Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 ---
  Documentation/userspace-api/index.rst  |   1 +
- Documentation/userspace-api/ntsync.rst | 398 +++++++++++++++++++++++++
+ Documentation/userspace-api/ntsync.rst | 385 +++++++++++++++++++++++++
- 2 files changed, 399 insertions(+)
+ 2 files changed, 386 insertions(+)
  create mode 100644 Documentation/userspace-api/ntsync.rst
 
 --- a/Documentation/userspace-api/index.rst
@@ -25,7 +25,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
  
 --- /dev/null
 +++ b/Documentation/userspace-api/ntsync.rst
-@@ -0,0 +1,398 @@
+@@ -0,0 +1,385 @@
 +===================================
 +NT synchronization primitive driver
 +===================================
@@ -101,19 +101,16 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +structures used in ioctl calls::
 +
 +   struct ntsync_sem_args {
-+   	__u32 sem;
 +   	__u32 count;
 +   	__u32 max;
 +   };
 +
 +   struct ntsync_mutex_args {
-+   	__u32 mutex;
 +   	__u32 owner;
 +   	__u32 count;
 +   };
 +
 +   struct ntsync_event_args {
-+   	__u32 event;
 +   	__u32 signaled;
 +   	__u32 manual;
 +   };
@@ -130,7 +127,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +   };
 +
 +Depending on the ioctl, members of the structure may be used as input,
-+output, or not at all. All ioctls return 0 on success.
++output, or not at all.
 +
 +The ioctls on the device file are as follows:
 +
@@ -141,14 +138,13 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``sem``
-+       - On output, contains a file descriptor to the created semaphore.
 +     * - ``count``
 +       - Initial count of the semaphore.
 +     * - ``max``
 +       - Maximum count of the semaphore.
 +
 +  Fails with ``EINVAL`` if ``count`` is greater than ``max``.
++  On success, returns a file descriptor the created semaphore.
 +
 +.. c:macro:: NTSYNC_IOC_CREATE_MUTEX
 +
@@ -157,8 +153,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``mutex``
-+       - On output, contains a file descriptor to the created mutex.
 +     * - ``count``
 +       - Initial recursion count of the mutex.
 +     * - ``owner``
@@ -166,6 +160,7 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  If ``owner`` is nonzero and ``count`` is zero, or if ``owner`` is
 +  zero and ``count`` is nonzero, the function fails with ``EINVAL``.
++  On success, returns a file descriptor the created mutex.
 +
 +.. c:macro:: NTSYNC_IOC_CREATE_EVENT
 +
@@ -174,8 +169,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``event``
-+       - On output, contains a file descriptor to the created event.
 +     * - ``signaled``
 +       - If nonzero, the event is initially signaled, otherwise
 +         nonsignaled.
@@ -183,6 +176,8 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +       - If nonzero, the event is a manual-reset event, otherwise
 +         auto-reset.
 +
++  On success, returns a file descriptor the created event.
++
 +The ioctls on the individual objects are as follows:
 +
 +.. c:macro:: NTSYNC_IOC_SEM_POST
@@ -205,8 +200,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``mutex``
-+       - Ignored.
 +     * - ``owner``
 +       - Specifies the owner trying to release this mutex.
 +     * - ``count``
@@ -255,8 +248,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``sem``
-+       - Ignored.
 +     * - ``count``
 +       - On output, contains the current count of the semaphore.
 +     * - ``max``
@@ -269,8 +260,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``mutex``
-+       - Ignored.
 +     * - ``owner``
 +       - On output, contains the current owner of the mutex, or zero
 +         if the mutex is not currently owned.
@@ -288,8 +277,6 @@ Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
 +
 +  .. list-table::
 +
-+     * - ``event``
-+       - Ignored.
 +     * - ``signaled``
 +       - On output, contains the current state of the event.
 +     * - ``manual``

debian/patches/misc-ntsync7/0018-ntsync-No-longer-depend-on-BROKEN.patch

@@ -0,0 +1,25 @@
+From 4871bb89577d78a3d55b44e47c3a4f677dbdc89b Mon Sep 17 00:00:00 2001
+From: Elizabeth Figura <zfigura@codeweavers.com>
+Date: Fri, 13 Dec 2024 13:35:11 -0600
+Subject: ntsync: No longer depend on BROKEN.
+
+f5b335dc025cfee90957efa90dc72fada0d5abb4 ("misc: ntsync: mark driver as "broken"
+to prevent from building") was committed to avoid the driver being used while
+only part of its functionality was released. Since the rest of the functionality
+has now been committed, revert this.
+
+Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
+---
+ drivers/misc/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -517,7 +517,6 @@ config OPEN_DICE
+ 
+ config NTSYNC
+ 	tristate "NT synchronization primitive emulation"
+-	depends on BROKEN
+ 	help
+ 	  This module provides kernel support for emulation of Windows NT
+ 	  synchronization primitives. It is not a hardware driver.

debian/patches/misc-ntsync7/0019-ntsync-Set-the-permissions-to-be-0666.patch

@@ -0,0 +1,22 @@
+From 2aa0cab3a568e6adccbe708ee2e79185638860ed Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Fri, 14 Feb 2025 12:28:00 +0000
+Subject: ntsync: Set the permissions to be 0666
+
+This allows ntsync to be usuable by non-root processes out of the box
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ drivers/misc/ntsync.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/misc/ntsync.c
++++ b/drivers/misc/ntsync.c
+@@ -1206,6 +1206,7 @@ static struct miscdevice ntsync_misc = {
+ 	.minor		= MISC_DYNAMIC_MINOR,
+ 	.name		= NTSYNC_NAME,
+ 	.fops		= &ntsync_fops,
++	.mode		= 0666, // Setting file permissions to 0666
+ };
+ 
+ module_misc_device(ntsync_misc);

debian/patches/misc-openwrt/0002-net-enable-fraglist-GRO-by-default.patch

@@ -1,24 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 23 Apr 2024 12:35:21 +0200
-Subject: [PATCH] net: enable fraglist GRO by default
-
-This can significantly improve performance for packet forwarding/bridging
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/include/linux/netdev_features.h
-+++ b/include/linux/netdev_features.h
-@@ -242,10 +242,10 @@ static inline int find_next_netdev_featu
- #define NETIF_F_UPPER_DISABLES	NETIF_F_LRO
- 
- /* changeable features with no special hardware requirements */
--#define NETIF_F_SOFT_FEATURES	(NETIF_F_GSO | NETIF_F_GRO)
-+#define NETIF_F_SOFT_FEATURES	(NETIF_F_GSO | NETIF_F_GRO | NETIF_F_GRO_FRAGLIST)
- 
- /* Changeable features with no special hardware requirements that defaults to off. */
--#define NETIF_F_SOFT_FEATURES_OFF	(NETIF_F_GRO_FRAGLIST | NETIF_F_GRO_UDP_FWD)
-+#define NETIF_F_SOFT_FEATURES_OFF	(NETIF_F_GRO_UDP_FWD)
- 
- #define NETIF_F_VLAN_FEATURES	(NETIF_F_HW_VLAN_CTAG_FILTER | \
- 				 NETIF_F_HW_VLAN_CTAG_RX | \

debian/patches/misc-openwrt/0003-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch

@@ -1,129 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 15 Aug 2024 21:15:13 +0200
-Subject: [PATCH] net: remove NETIF_F_GSO_FRAGLIST from NETIF_F_GSO_SOFTWARE
-
-Several drivers set NETIF_F_GSO_SOFTWARE, but mangle fraglist GRO packets
-in a way that they can't be properly segmented anymore.
-In order to properly deal with this, remove fraglist GSO from
-NETIF_F_GSO_SOFTWARE and switch to NETIF_F_GSO_SOFTWARE_ALL (which includes
-fraglist GSO) in places where it's safe to add.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/dummy.c
-+++ b/drivers/net/dummy.c
-@@ -110,7 +110,7 @@ static void dummy_setup(struct net_devic
- 	dev->flags &= ~IFF_MULTICAST;
- 	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;
- 	dev->features	|= NETIF_F_SG | NETIF_F_FRAGLIST;
--	dev->features	|= NETIF_F_GSO_SOFTWARE;
-+	dev->features	|= NETIF_F_GSO_SOFTWARE_ALL;
- 	dev->features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;
- 	dev->features	|= NETIF_F_GSO_ENCAP_ALL;
- 	dev->hw_features |= dev->features;
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -172,7 +172,7 @@ static void gen_lo_setup(struct net_devi
- 	dev->flags		= IFF_LOOPBACK;
- 	dev->priv_flags		|= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;
- 	netif_keep_dst(dev);
--	dev->hw_features	= NETIF_F_GSO_SOFTWARE;
-+	dev->hw_features	= NETIF_F_GSO_SOFTWARE_ALL;
- 	dev->features		= NETIF_F_SG | NETIF_F_FRAGLIST
- 		| NETIF_F_GSO_SOFTWARE
- 		| NETIF_F_HW_CSUM
---- a/drivers/net/macvlan.c
-+++ b/drivers/net/macvlan.c
-@@ -897,7 +897,7 @@ static int macvlan_hwtstamp_set(struct n
- static struct lock_class_key macvlan_netdev_addr_lock_key;
- 
- #define ALWAYS_ON_OFFLOADS \
--	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE | \
-+	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE_ALL | \
- 	 NETIF_F_GSO_ROBUST | NETIF_F_GSO_ENCAP_ALL)
- 
- #define ALWAYS_ON_FEATURES (ALWAYS_ON_OFFLOADS | NETIF_F_LLTX)
---- a/include/linux/netdev_features.h
-+++ b/include/linux/netdev_features.h
-@@ -219,13 +219,14 @@ static inline int find_next_netdev_featu
- 
- /* List of features with software fallbacks. */
- #define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP |	     \
--				 NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST)
-+				 NETIF_F_GSO_UDP_L4)
-+#define NETIF_F_GSO_SOFTWARE_ALL (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_FRAGLIST)
- 
- /*
-  * If one device supports one of these features, then enable them
-  * for all in netdev_increment_features.
-  */
--#define NETIF_F_ONE_FOR_ALL	(NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \
-+#define NETIF_F_ONE_FOR_ALL	(NETIF_F_GSO_SOFTWARE_ALL | NETIF_F_GSO_ROBUST | \
- 				 NETIF_F_SG | NETIF_F_HIGHDMA |		\
- 				 NETIF_F_FRAGLIST | NETIF_F_VLAN_CHALLENGED)
- 
---- a/net/8021q/vlan.h
-+++ b/net/8021q/vlan.h
-@@ -108,7 +108,7 @@ static inline netdev_features_t vlan_tnl
- 	netdev_features_t ret;
- 
- 	ret = real_dev->hw_enc_features &
--	      (NETIF_F_CSUM_MASK | NETIF_F_GSO_SOFTWARE |
-+	      (NETIF_F_CSUM_MASK | NETIF_F_GSO_SOFTWARE_ALL |
- 	       NETIF_F_GSO_ENCAP_ALL);
- 
- 	if ((ret & NETIF_F_GSO_ENCAP_ALL) && (ret & NETIF_F_CSUM_MASK))
---- a/net/8021q/vlan_dev.c
-+++ b/net/8021q/vlan_dev.c
-@@ -561,7 +561,7 @@ static int vlan_dev_init(struct net_devi
- 		dev->state |= (1 << __LINK_STATE_NOCARRIER);
- 
- 	dev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG |
--			   NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE |
-+			   NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE_ALL |
- 			   NETIF_F_GSO_ENCAP_ALL |
- 			   NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
- 			   NETIF_F_ALL_FCOE;
-@@ -654,7 +654,7 @@ static netdev_features_t vlan_dev_fix_fe
- 	if (lower_features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))
- 		lower_features |= NETIF_F_HW_CSUM;
- 	features = netdev_intersect_features(features, lower_features);
--	features |= old_features & (NETIF_F_SOFT_FEATURES | NETIF_F_GSO_SOFTWARE);
-+	features |= old_features & (NETIF_F_SOFT_FEATURES | NETIF_F_GSO_SOFTWARE_ALL);
- 	features |= NETIF_F_LLTX;
- 
- 	return features;
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2451,7 +2451,7 @@ void sk_setup_caps(struct sock *sk, stru
- 	if (sk_is_tcp(sk))
- 		sk->sk_route_caps |= NETIF_F_GSO;
- 	if (sk->sk_route_caps & NETIF_F_GSO)
--		sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE;
-+		sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE_ALL;
- 	if (unlikely(sk->sk_gso_disabled))
- 		sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
- 	if (sk_can_gso(sk)) {
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -2009,7 +2009,7 @@ void ieee80211_color_collision_detection
- /* interface handling */
- #define MAC80211_SUPPORTED_FEATURES_TX	(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \
- 					 NETIF_F_HW_CSUM | NETIF_F_SG | \
--					 NETIF_F_HIGHDMA | NETIF_F_GSO_SOFTWARE | \
-+					 NETIF_F_HIGHDMA | NETIF_F_GSO_SOFTWARE_ALL | \
- 					 NETIF_F_HW_TC)
- #define MAC80211_SUPPORTED_FEATURES_RX	(NETIF_F_RXCSUM)
- #define MAC80211_SUPPORTED_FEATURES	(MAC80211_SUPPORTED_FEATURES_TX | \
---- a/net/openvswitch/vport-internal_dev.c
-+++ b/net/openvswitch/vport-internal_dev.c
-@@ -109,7 +109,7 @@ static void do_setup(struct net_device *
- 
- 	netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
- 			   NETIF_F_HIGHDMA | NETIF_F_HW_CSUM |
--			   NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ENCAP_ALL;
-+			   NETIF_F_GSO_SOFTWARE_ALL | NETIF_F_GSO_ENCAP_ALL;
- 
- 	netdev->vlan_features = netdev->features;
- 	netdev->hw_enc_features = netdev->features;

debian/patches/mixed-arch/0001-ZEN-Add-graysky-s-more-ISA-levels-and-uarches.patch

@@ -1,14 +1,14 @@
-From a657df31affbb91d8cb2718e70f42cf8ed6e9a7c Mon Sep 17 00:00:00 2001
+From 421120bda34d994c5e0e07a89e2f9c40c53e8e87 Mon Sep 17 00:00:00 2001
 From: graysky <therealgraysky AT proton DOT me>
 Date: Mon, 16 Sep 2024 05:55:58 -0400
-Subject: ZEN: Add graysky's more-ISA-levels-and-uarches
+Subject: ZEN: Add graysky's more-uarches
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 From https://github.com/graysky2/kernel_compiler_patch
 
-more-ISA-levels-and-uarches-for-kernel-6.8-rc4+.patch
+more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch
 
 FEATURES
 This patch adds additional tunings via new x86-64 ISA levels and
@@ -111,7 +111,7 @@ See the following experimental evidence supporting this statement:
 https://github.com/graysky2/kernel_compiler_patch?tab=readme-ov-file#benchmarks
 
 REQUIREMENTS
-linux version 6.8-rc3+
+linux version 6.1.79+
 gcc version >=9.0 or clang version >=9.0
 
 ACKNOWLEDGMENTS
@@ -123,10 +123,10 @@ REFERENCES
 3.  https://github.com/graysky2/kernel_gcc_patch/issues/15
 4.  http://www.linuxforge.net/docs/linux/linux-gcc.php
 ---
- arch/x86/Kconfig.cpu            | 363 ++++++++++++++++++++++++++++++--
+ arch/x86/Kconfig.cpu            | 359 ++++++++++++++++++++++++++++++--
- arch/x86/Makefile               |  89 +++++++-
+ arch/x86/Makefile               |  87 +++++++-
- arch/x86/include/asm/vermagic.h |  70 ++++++
+ arch/x86/include/asm/vermagic.h |  70 +++++++
- 3 files changed, 506 insertions(+), 16 deletions(-)
+ 3 files changed, 499 insertions(+), 17 deletions(-)
 
 --- a/arch/x86/Kconfig.cpu
 +++ b/arch/x86/Kconfig.cpu
@@ -483,7 +483,7 @@ REFERENCES
  
  config GENERIC_CPU
  	bool "Generic-x86-64"
-@@ -294,8 +581,32 @@ config GENERIC_CPU
+@@ -294,6 +581,26 @@ config GENERIC_CPU
  	  Generic x86-64 CPU.
  	  Run equally well on all x86-64 CPUs.
  
@@ -509,14 +509,8 @@ REFERENCES
 +
  endchoice
  
-+config SUPPORT_MARCH_CODEVERS
-+	bool
-+	default y if (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
-+
  config X86_GENERIC
- 	bool "Generic x86 support"
+@@ -308,6 +615,30 @@ config X86_GENERIC
- 	depends on X86_32
-@@ -308,6 +619,30 @@ config X86_GENERIC
  	  This is really intended for distributors who need more
  	  generic optimizations.
  
@@ -547,7 +541,7 @@ REFERENCES
  #
  # Define implied options from the CPU selection here
  config X86_INTERNODE_CACHE_SHIFT
-@@ -318,7 +653,7 @@ config X86_INTERNODE_CACHE_SHIFT
+@@ -318,7 +649,7 @@ config X86_INTERNODE_CACHE_SHIFT
  config X86_L1_CACHE_SHIFT
  	int
  	default "7" if MPENTIUM4 || MPSC
@@ -556,7 +550,7 @@ REFERENCES
  	default "4" if MELAN || M486SX || M486 || MGEODEGX1
  	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
  
-@@ -336,11 +671,11 @@ config X86_ALIGNMENT_16
+@@ -336,11 +667,11 @@ config X86_ALIGNMENT_16
  
  config X86_INTEL_USERCOPY
  	def_bool y
@@ -572,11 +566,13 @@ REFERENCES
  # P6_NOPs are a relatively minor optimization that require a family >=
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -178,14 +178,99 @@ else
+@@ -182,15 +182,96 @@ else
+         cflags-$(CONFIG_MK8)		+= -march=k8
          cflags-$(CONFIG_MPSC)		+= -march=nocona
          cflags-$(CONFIG_MCORE2)		+= -march=core2
-         cflags-$(CONFIG_MATOM)		+= -march=atom
+-        cflags-$(CONFIG_MATOM)		+= -march=atom
 -        cflags-$(CONFIG_GENERIC_CPU)	+= -mtune=generic
++        cflags-$(CONFIG_MATOM)		+= -march=bonnell
 +        ifeq ($(CONFIG_X86_64_VERSION),1)
 +          cflags-$(CONFIG_GENERIC_CPU)		+= -mtune=generic
 +          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
@@ -600,8 +596,6 @@ REFERENCES
 +        cflags-$(CONFIG_MZEN5) 	+= -march=znver5
 +        cflags-$(CONFIG_MNATIVE_INTEL) += -march=native
 +        cflags-$(CONFIG_MNATIVE_AMD) 	+= -march=native -mno-tbm
-+        cflags-$(CONFIG_MATOM) 	+= -march=bonnell
-+        cflags-$(CONFIG_MCORE2) 	+= -march=core2
 +        cflags-$(CONFIG_MNEHALEM) 	+= -march=nehalem
 +        cflags-$(CONFIG_MWESTMERE) 	+= -march=westmere
 +        cflags-$(CONFIG_MSILVERMONT) 	+= -march=silvermont
@@ -647,8 +641,6 @@ REFERENCES
 +        rustflags-$(CONFIG_MZEN5) 	+= -Ctarget-cpu=znver5
 +        rustflags-$(CONFIG_MNATIVE_INTEL) += -Ctarget-cpu=native
 +        rustflags-$(CONFIG_MNATIVE_AMD) 	+= -Ctarget-cpu=native
-+        rustflags-$(CONFIG_MATOM) 	+= -Ctarget-cpu=bonnell
-+        rustflags-$(CONFIG_MCORE2) 	+= -Ctarget-cpu=core2
 +        rustflags-$(CONFIG_MNEHALEM) 	+= -Ctarget-cpu=nehalem
 +        rustflags-$(CONFIG_MWESTMERE) 	+= -Ctarget-cpu=westmere
 +        rustflags-$(CONFIG_MSILVERMONT) 	+= -Ctarget-cpu=silvermont

debian/patches/mixed-arch/0002-ZEN-Fixup-graysky-s-more-ISA-levels-and-uarches.patch

@@ -1,60 +0,0 @@
-From 44295ad130b8735cecb288dd7463a14892803d9b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Tue, 1 Oct 2024 02:05:12 +0200
-Subject: ZEN: Fixup graysky's more-ISA-levels-and-uarches
-
-See: https://github.com/graysky2/kernel_compiler_patch/issues/105
----
- arch/x86/Kconfig.cpu            | 4 ----
- arch/x86/Makefile               | 4 ----
- arch/x86/include/asm/vermagic.h | 6 ++++++
- 3 files changed, 6 insertions(+), 8 deletions(-)
-
---- a/arch/x86/Kconfig.cpu
-+++ b/arch/x86/Kconfig.cpu
-@@ -603,10 +603,6 @@ config MNATIVE_AMD
- 
- endchoice
- 
--config SUPPORT_MARCH_CODEVERS
--	bool
--	default y if (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
--
- config X86_GENERIC
- 	bool "Generic x86 support"
- 	depends on X86_32
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -176,8 +176,6 @@ else
-         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
-         cflags-$(CONFIG_MK8)		+= -march=k8
-         cflags-$(CONFIG_MPSC)		+= -march=nocona
--        cflags-$(CONFIG_MCORE2)		+= -march=core2
--        cflags-$(CONFIG_MATOM)		+= -march=atom
-         ifeq ($(CONFIG_X86_64_VERSION),1)
-           cflags-$(CONFIG_GENERIC_CPU)		+= -mtune=generic
-           rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
-@@ -229,8 +227,6 @@ else
- 
-         rustflags-$(CONFIG_MK8)		+= -Ctarget-cpu=k8
-         rustflags-$(CONFIG_MPSC)	+= -Ctarget-cpu=nocona
--        rustflags-$(CONFIG_MCORE2)	+= -Ctarget-cpu=core2
--        rustflags-$(CONFIG_MATOM)	+= -Ctarget-cpu=atom
-         rustflags-$(CONFIG_MK8SSE3)	+= -Ctarget-cpu=k8-sse3
-         rustflags-$(CONFIG_MK10) 		+= -Ctarget-cpu=amdfam10
-         rustflags-$(CONFIG_MBARCELONA) 	+= -Ctarget-cpu=barcelona
---- a/arch/x86/include/asm/vermagic.h
-+++ b/arch/x86/include/asm/vermagic.h
-@@ -105,6 +105,12 @@
- #define MODULE_PROC_FAMILY "ZEN "
- #elif defined CONFIG_MZEN2
- #define MODULE_PROC_FAMILY "ZEN2 "
-+#elif defined CONFIG_MZEN3
-+#define MODULE_PROC_FAMILY "ZEN3 "
-+#elif defined CONFIG_MZEN4
-+#define MODULE_PROC_FAMILY "ZEN4 "
-+#elif defined CONFIG_MZEN5
-+#define MODULE_PROC_FAMILY "ZEN5 "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE

debian/patches/mixed-arch/0002-ZEN-Restore-CONFIG_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -1,4 +1,4 @@
-From 8dc948926f5b68b16a6a47a8f6e0a2154ac8ef3e Mon Sep 17 00:00:00 2001
+From 1fc1195e784540ad1966b57267fc927a87c5d21d Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
 Date: Sun, 11 Dec 2022 23:51:16 +0100
 Subject: ZEN: Restore CONFIG_OPTIMIZE_FOR_PERFORMANCE_O3
@@ -13,7 +13,7 @@ dependency on CONFIG_ARC and adds RUSTFLAGS.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -814,6 +814,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
+@@ -820,6 +820,9 @@ KBUILD_CFLAGS	+= -fno-delete-null-pointe
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS += -O2
  KBUILD_RUSTFLAGS += -Copt-level=2
@@ -25,7 +25,7 @@ dependency on CONFIG_ARC and adds RUSTFLAGS.
  KBUILD_RUSTFLAGS += -Copt-level=s
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1407,6 +1407,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
+@@ -1451,6 +1451,12 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
  	  with the "-O2" compiler flag for best performance and most
  	  helpful compile-time warnings.
  

debian/patches/mixed-arch/0003-krd-adjust-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -828,6 +828,10 @@ KBUILD_CFLAGS += -Os
+ KBUILD_RUSTFLAGS += -Copt-level=s
+ endif
+ 
++ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3
++KBUILD_CFLAGS += $(call cc-option,-fivopts)
++endif
++
+ # Always set `debug-assertions` and `overflow-checks` because their default
+ # depends on `opt-level` and `debug-assertions`, respectively.
+ KBUILD_RUSTFLAGS += -Cdebug-assertions=$(if $(CONFIG_RUST_DEBUG_ASSERTIONS),y,n)

debian/patches/mixed-arch/0004-XANMOD-x86-build-Prevent-generating-avx2-and-avx512-.patch

@@ -11,7 +11,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -70,9 +70,9 @@ export BITS
+@@ -74,9 +74,9 @@ export BITS
  #
  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383
  #

debian/patches/mixed-arch/0004-krd-adjust-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3.patch

@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -815,7 +815,7 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
- KBUILD_CFLAGS += -O2
- KBUILD_RUSTFLAGS += -Copt-level=2
- else ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3
--KBUILD_CFLAGS += -O3
-+KBUILD_CFLAGS += -O3 $(call cc-option,-fivopts)
- KBUILD_RUSTFLAGS += -Copt-level=3
- else ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS += -Os

debian/patches/mixed-arch/0005-krd-adjust-KBUILD_CFLAGS-fno-tree-vectorize.patch

@@ -1,6 +1,6 @@
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -70,7 +70,7 @@ export BITS
+@@ -74,7 +74,7 @@ export BITS
  #
  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383
  #

debian/patches/mixed-arch/0006-XANMOD-kbuild-Add-GCC-SMS-based-modulo-scheduling-fl.patch

@@ -1,24 +1,26 @@
-From 2a949c896ea66e647d94254c28b1d4d6194ee14b Mon Sep 17 00:00:00 2001
+From dccbc0ca6c05ae315967a603870d553c231a68a1 Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Mon, 16 Sep 2024 00:55:35 +0000
-Subject: [PATCH 03/19] XANMOD: kbuild: Add GCC SMS-based modulo scheduling
+Subject: [PATCH 02/18] XANMOD: kbuild: Add GCC SMS-based modulo scheduling
  flags
 
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
- Makefile | 5 +++++
+ Makefile | 7 ++++
- 1 file changed, 5 insertions(+)
+ 1 file changed, 7 insertions(+)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -822,6 +822,11 @@ KBUILD_CFLAGS += -Os
+@@ -832,6 +832,13 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
- KBUILD_RUSTFLAGS += -Copt-level=s
+ KBUILD_CFLAGS += $(call cc-option,-fivopts)
  endif
  
++ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3
 +# Perform swing modulo scheduling immediately before the first scheduling pass.
 +# This pass looks at innermost loops and reorders their instructions by
 +# overlapping different iterations.
 +KBUILD_CFLAGS += $(call cc-option,-fmodulo-sched -fmodulo-sched-allow-regmoves)
++endif
 +
  # Always set `debug-assertions` and `overflow-checks` because their default
  # depends on `opt-level` and `debug-assertions`, respectively.

debian/patches/mixed-arch/0007-PF-kbuild-6.12-adopt-proposed-upstream-change-for-gener.patch

@@ -0,0 +1,24 @@
+From 578cb97f41beb5d2dde81b8a4c1db6e01e8bcc6a Mon Sep 17 00:00:00 2001
+From: Oleksandr Natalenko <oleksandr@natalenko.name>
+Date: Wed, 11 Dec 2024 08:50:50 +0100
+Subject: kbuild-6.12: adopt proposed upstream change for generic CPUs
+
+Link: https://lore.kernel.org/lkml/20241210144945.2325330-4-arnd@kernel.org/
+Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+---
+ arch/x86/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -184,8 +184,8 @@ else
+         cflags-$(CONFIG_MCORE2)		+= -march=core2
+         cflags-$(CONFIG_MATOM)		+= -march=bonnell
+         ifeq ($(CONFIG_X86_64_VERSION),1)
+-          cflags-$(CONFIG_GENERIC_CPU)		+= -mtune=generic
+-          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ztune-cpu=generic
++          cflags-$(CONFIG_GENERIC_CPU)		+= -march=x86-64 -mtune=generic
++          rustflags-$(CONFIG_GENERIC_CPU)	+= -Ctarget-cpu=x86-64 -Ztune-cpu=generic
+         else
+           cflags-$(CONFIG_GENERIC_CPU)		+= -march=x86-64-v$(CONFIG_X86_64_VERSION)
+           rustflags-$(CONFIG_GENERIC_CPU)	+= -Ctarget-cpu=x86-64-v$(CONFIG_X86_64_VERSION)

debian/patches/patchset-pf/amd-pstate/0001-cpufreq-amd-pstate-add-quirk-for-Ryzen-3000-series-p.patch

@@ -1,70 +0,0 @@
-From 3427331872c37b2edb42406c65764e1565b0591b Mon Sep 17 00:00:00 2001
-From: Perry Yuan <perry.yuan@amd.com>
-Date: Fri, 9 Aug 2024 14:09:05 +0800
-Subject: cpufreq: amd-pstate: add quirk for Ryzen 3000 series processor
-
-The Ryzen 3000 series processors have been observed lacking the
-nominal_freq and lowest_freq parameters in their ACPI tables. This
-absence causes issues with loading the amd-pstate driver on these
-systems. Introduces a fix to resolve the dependency issue
-by adding a quirk specifically for the Ryzen 3000 series.
-
-Reported-by: David Wang <00107082@163.com>
-Signed-off-by: Perry Yuan <perry.yuan@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -142,6 +142,11 @@ static struct quirk_entry quirk_amd_7k62
- 	.lowest_freq = 550,
- };
- 
-+static struct quirk_entry quirk_amd_mts = {
-+	.nominal_freq = 3600,
-+	.lowest_freq = 550,
-+};
-+
- static int __init dmi_matched_7k62_bios_bug(const struct dmi_system_id *dmi)
- {
- 	/**
-@@ -158,6 +163,21 @@ static int __init dmi_matched_7k62_bios_
- 	return 0;
- }
- 
-+static int __init dmi_matched_mts_bios_bug(const struct dmi_system_id *dmi)
-+{
-+	/**
-+	 * match the broken bios for ryzen 3000 series processor support CPPC V2
-+	 * broken BIOS lack of nominal_freq and lowest_freq capabilities
-+	 * definition in ACPI tables
-+	 */
-+	if (cpu_feature_enabled(X86_FEATURE_ZEN2)) {
-+		quirks = dmi->driver_data;
-+		pr_info("Overriding nominal and lowest frequencies for %s\n", dmi->ident);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
- static const struct dmi_system_id amd_pstate_quirks_table[] __initconst = {
- 	{
- 		.callback = dmi_matched_7k62_bios_bug,
-@@ -168,6 +188,16 @@ static const struct dmi_system_id amd_ps
- 		},
- 		.driver_data = &quirk_amd_7k62,
- 	},
-+	{
-+		.callback = dmi_matched_mts_bios_bug,
-+		.ident = "AMD Ryzen 3000",
-+		.matches = {
-+			DMI_MATCH(DMI_PRODUCT_NAME, "B450M MORTAR MAX (MS-7B89)"),
-+			DMI_MATCH(DMI_BIOS_RELEASE, "06/10/2020"),
-+			DMI_MATCH(DMI_BIOS_VERSION, "5.14"),
-+		},
-+		.driver_data = &quirk_amd_mts,
-+	},
- 	{}
- };
- MODULE_DEVICE_TABLE(dmi, amd_pstate_quirks_table);

debian/patches/patchset-pf/amd-pstate/0002-cpufreq-amd-pstate-Export-symbols-for-changing-modes.patch

@@ -1,88 +0,0 @@
-From 44f21855901b1fd618ac16b07dbd14e8fea4ee13 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Sat, 31 Aug 2024 21:49:11 -0500
-Subject: cpufreq/amd-pstate: Export symbols for changing modes
-
-In order to effectively test all mode switch combinations export
-everything necessarily for amd-pstate-ut to trigger a mode switch.
-
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/cpufreq/amd-pstate.c | 23 ++++++++++-------------
- drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
- 2 files changed, 24 insertions(+), 13 deletions(-)
-
---- a/drivers/cpufreq/amd-pstate.c
-+++ b/drivers/cpufreq/amd-pstate.c
-@@ -60,18 +60,6 @@
- #define AMD_CPPC_EPP_BALANCE_POWERSAVE		0xBF
- #define AMD_CPPC_EPP_POWERSAVE			0xFF
- 
--/*
-- * enum amd_pstate_mode - driver working mode of amd pstate
-- */
--enum amd_pstate_mode {
--	AMD_PSTATE_UNDEFINED = 0,
--	AMD_PSTATE_DISABLE,
--	AMD_PSTATE_PASSIVE,
--	AMD_PSTATE_ACTIVE,
--	AMD_PSTATE_GUIDED,
--	AMD_PSTATE_MAX,
--};
--
- static const char * const amd_pstate_mode_string[] = {
- 	[AMD_PSTATE_UNDEFINED]   = "undefined",
- 	[AMD_PSTATE_DISABLE]     = "disable",
-@@ -81,6 +69,14 @@ static const char * const amd_pstate_mod
- 	NULL,
- };
- 
-+const char *amd_pstate_get_mode_string(enum amd_pstate_mode mode)
-+{
-+	if (mode < 0 || mode >= AMD_PSTATE_MAX)
-+		return NULL;
-+	return amd_pstate_mode_string[mode];
-+}
-+EXPORT_SYMBOL_GPL(amd_pstate_get_mode_string);
-+
- struct quirk_entry {
- 	u32 nominal_freq;
- 	u32 lowest_freq;
-@@ -1392,7 +1388,7 @@ static ssize_t amd_pstate_show_status(ch
- 	return sysfs_emit(buf, "%s\n", amd_pstate_mode_string[cppc_state]);
- }
- 
--static int amd_pstate_update_status(const char *buf, size_t size)
-+int amd_pstate_update_status(const char *buf, size_t size)
- {
- 	int mode_idx;
- 
-@@ -1409,6 +1405,7 @@ static int amd_pstate_update_status(cons
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(amd_pstate_update_status);
- 
- static ssize_t status_show(struct device *dev,
- 			   struct device_attribute *attr, char *buf)
---- a/drivers/cpufreq/amd-pstate.h
-+++ b/drivers/cpufreq/amd-pstate.h
-@@ -103,4 +103,18 @@ struct amd_cpudata {
- 	bool	boost_state;
- };
- 
-+/*
-+ * enum amd_pstate_mode - driver working mode of amd pstate
-+ */
-+enum amd_pstate_mode {
-+	AMD_PSTATE_UNDEFINED = 0,
-+	AMD_PSTATE_DISABLE,
-+	AMD_PSTATE_PASSIVE,
-+	AMD_PSTATE_ACTIVE,
-+	AMD_PSTATE_GUIDED,
-+	AMD_PSTATE_MAX,
-+};
-+const char *amd_pstate_get_mode_string(enum amd_pstate_mode mode);
-+int amd_pstate_update_status(const char *buf, size_t size);
-+
- #endif /* _LINUX_AMD_PSTATE_H */