summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 17:39:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 17:39:59 +0000
commit27d3313807296c3943a96ceef8c2b7279cb56962 (patch)
tree7d08e78c36ab6437b403fc7cd8c23e41f135c7a3 /debian/patches
parentMerging upstream version 6.7.7. (diff)
downloadlinux-27d3313807296c3943a96ceef8c2b7279cb56962.tar.xz
linux-27d3313807296c3943a96ceef8c2b7279cb56962.zip
Adding debian version 6.7.7-1.debian/6.7.7-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch38
-rw-r--r--debian/patches/debian/Revert-docs-kernel_feat.py-fix-potential-command-inj.patch295
-rw-r--r--debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch12
-rw-r--r--debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch55
-rw-r--r--debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch9
-rw-r--r--debian/patches/debian/gitignore.patch8
-rw-r--r--debian/patches/debian/ia64-hardcode-arch-script-output.patch71
-rw-r--r--debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch27
-rw-r--r--debian/patches/debian/version.patch25
-rw-r--r--debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch35
-rw-r--r--debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch6
-rw-r--r--debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch14
-rw-r--r--debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch10
-rw-r--r--debian/patches/series4
14 files changed, 95 insertions, 514 deletions
diff --git a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
index e6eec33dd7..7f5da028c5 100644
--- a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
+++ b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
@@ -11,7 +11,7 @@ upstream submission.
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
-@@ -912,10 +912,8 @@ static enum ucode_state request_microcod
+@@ -894,10 +894,8 @@ static enum ucode_state request_microcod
if (c->x86 >= 0x15)
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
@@ -22,7 +22,7 @@ upstream submission.
- }
ret = UCODE_ERROR;
- if (!verify_container(fw->data, fw->size, false))
+ if (!verify_container(fw->data, fw->size))
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2398,10 +2398,9 @@ static int fore200e_load_and_start_fw(st
@@ -499,7 +499,7 @@ upstream submission.
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
-@@ -3901,10 +3901,8 @@ static int pvr_boot(struct bttv *btv)
+@@ -3902,10 +3902,8 @@ static int pvr_boot(struct bttv *btv)
int rc;
rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev);
@@ -712,7 +712,7 @@ upstream submission.
}
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
-@@ -983,11 +983,6 @@ static int cx231xx_load_firmware(struct
+@@ -982,11 +982,6 @@ static int cx231xx_load_firmware(struct
dev->dev);
if (retval != 0) {
@@ -1090,7 +1090,7 @@ upstream submission.
if (bp->mips_firmware->size < sizeof(*mips_fw) ||
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -11394,11 +11394,8 @@ static int tg3_request_firmware(struct t
+@@ -11474,11 +11474,8 @@ static int tg3_request_firmware(struct t
{
const struct tg3_firmware_hdr *fw_hdr;
@@ -1281,7 +1281,7 @@ upstream submission.
fwh = (struct at76_fw_header *)(fwe->fw->data);
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
-@@ -3892,12 +3892,8 @@ static int reset_atmel_card(struct net_d
+@@ -3820,12 +3820,8 @@ static int reset_atmel_card(struct net_d
strcpy(priv->firmware_id, "atmel_at76c502.bin");
}
err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev);
@@ -1359,7 +1359,7 @@ upstream submission.
}
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
-@@ -8359,12 +8359,8 @@ static int ipw2100_get_firmware(struct i
+@@ -8354,12 +8354,8 @@ static int ipw2100_get_firmware(struct i
rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
@@ -1399,7 +1399,7 @@ upstream submission.
else
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-@@ -241,8 +241,6 @@ static int iwl_request_firmware(struct i
+@@ -249,8 +249,6 @@ static int iwl_request_firmware(struct i
drv->fw_index--;
if (drv->fw_index < cfg->ucode_api_min) {
@@ -1744,7 +1744,7 @@ upstream submission.
}
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
-@@ -4009,10 +4009,8 @@ static ssize_t ipr_store_update_fw(struc
+@@ -4013,10 +4013,8 @@ static ssize_t ipr_store_update_fw(struc
if (endline)
*endline = '\0';
@@ -1770,7 +1770,7 @@ upstream submission.
}
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
-@@ -1504,8 +1504,6 @@ qla1280_request_firmware(struct scsi_qla
+@@ -1506,8 +1506,6 @@ qla1280_request_firmware(struct scsi_qla
err = request_firmware(&fw, fwname, &ha->pdev->dev);
if (err) {
@@ -1819,7 +1819,7 @@ upstream submission.
if (qla82xx_validate_firmware_blob(vha,
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -7696,8 +7696,6 @@ qla2x00_request_firmware(scsi_qla_host_t
+@@ -7697,8 +7697,6 @@ qla2x00_request_firmware(scsi_qla_host_t
goto out;
if (request_firmware(&blob->fw, blob->name, &ha->pdev->dev)) {
@@ -1843,20 +1843,6 @@ upstream submission.
if (fw->size % 2) {
printk(KERN_ERR "Bogus length %zu in image \"%s\"\n",
fw->size, fwname);
---- a/drivers/staging/rtl8192u/r819xU_firmware.c
-+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
-@@ -240,10 +240,8 @@ bool init_firmware(struct net_device *de
- */
- if (rst_opt == OPT_SYSTEM_RESET) {
- rc = request_firmware(&fw_entry, fw_name[init_step], &priv->udev->dev);
-- if (rc < 0) {
-- RT_TRACE(COMP_ERR, "request firmware fail!\n");
-+ if (rc)
- goto download_firmware_fail;
-- }
-
- if (fw_entry->size > sizeof(pfirmware->firmware_buf)) {
- RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -72,8 +72,6 @@ int rtl871x_load_fw(struct _adapter *pad
@@ -2280,7 +2266,7 @@ upstream submission.
snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -2040,8 +2040,6 @@ static void azx_firmware_cb(const struct
+@@ -2034,8 +2034,6 @@ static void azx_firmware_cb(const struct
if (fw)
chip->fw = fw;
diff --git a/debian/patches/debian/Revert-docs-kernel_feat.py-fix-potential-command-inj.patch b/debian/patches/debian/Revert-docs-kernel_feat.py-fix-potential-command-inj.patch
deleted file mode 100644
index 7bfaf99b47..0000000000
--- a/debian/patches/debian/Revert-docs-kernel_feat.py-fix-potential-command-inj.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 4f86519c560fd00b2ab58721cf2943e07107437d Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <carnil@debian.org>
-Date: Sun, 4 Feb 2024 21:02:11 +0100
-Subject: [PATCH 2/2] Revert "docs: kernel_feat.py: fix potential command
- injection"
-
-This reverts commit e961f8c6966abbd486ff87549e29e53f3c69b685.
----
- Documentation/admin-guide/features.rst | 2 +-
- Documentation/arch/arc/features.rst | 2 +-
- Documentation/arch/arm/features.rst | 2 +-
- Documentation/arch/arm64/features.rst | 2 +-
- Documentation/arch/loongarch/features.rst | 2 +-
- Documentation/arch/m68k/features.rst | 2 +-
- Documentation/arch/mips/features.rst | 2 +-
- Documentation/arch/nios2/features.rst | 2 +-
- Documentation/arch/openrisc/features.rst | 2 +-
- Documentation/arch/parisc/features.rst | 2 +-
- Documentation/arch/s390/features.rst | 2 +-
- Documentation/arch/sh/features.rst | 2 +-
- Documentation/arch/sparc/features.rst | 2 +-
- Documentation/arch/x86/features.rst | 2 +-
- Documentation/arch/xtensa/features.rst | 2 +-
- Documentation/powerpc/features.rst | 2 +-
- Documentation/riscv/features.rst | 2 +-
- Documentation/sphinx/kernel_feat.py | 55 +++++++++++++++----
- .../zh_CN/arch/loongarch/features.rst | 2 +-
- .../translations/zh_CN/arch/mips/features.rst | 2 +-
- 20 files changed, 63 insertions(+), 30 deletions(-)
-
-diff --git a/Documentation/admin-guide/features.rst b/Documentation/admin-guide/features.rst
-index 7651eca38227..8c167082a84f 100644
---- a/Documentation/admin-guide/features.rst
-+++ b/Documentation/admin-guide/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features
-+.. kernel-feat:: $srctree/Documentation/features
-diff --git a/Documentation/arch/arc/features.rst b/Documentation/arch/arc/features.rst
-index 49ff446ff744..b793583d688a 100644
---- a/Documentation/arch/arc/features.rst
-+++ b/Documentation/arch/arc/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features arc
-+.. kernel-feat:: $srctree/Documentation/features arc
-diff --git a/Documentation/arch/arm/features.rst b/Documentation/arch/arm/features.rst
-index 0e76aaf68eca..7414ec03dd15 100644
---- a/Documentation/arch/arm/features.rst
-+++ b/Documentation/arch/arm/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features arm
-+.. kernel-feat:: $srctree/Documentation/features arm
-diff --git a/Documentation/arch/arm64/features.rst b/Documentation/arch/arm64/features.rst
-index 03321f4309d0..dfa4cb3cd3ef 100644
---- a/Documentation/arch/arm64/features.rst
-+++ b/Documentation/arch/arm64/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features arm64
-+.. kernel-feat:: $srctree/Documentation/features arm64
-diff --git a/Documentation/arch/loongarch/features.rst b/Documentation/arch/loongarch/features.rst
-index 009f44c7951f..ebacade3ea45 100644
---- a/Documentation/arch/loongarch/features.rst
-+++ b/Documentation/arch/loongarch/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features loongarch
-+.. kernel-feat:: $srctree/Documentation/features loongarch
-diff --git a/Documentation/arch/m68k/features.rst b/Documentation/arch/m68k/features.rst
-index de7f0ccf7fc8..5107a2119472 100644
---- a/Documentation/arch/m68k/features.rst
-+++ b/Documentation/arch/m68k/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features m68k
-+.. kernel-feat:: $srctree/Documentation/features m68k
-diff --git a/Documentation/arch/mips/features.rst b/Documentation/arch/mips/features.rst
-index 6e0ffe3e7354..1973d729b29a 100644
---- a/Documentation/arch/mips/features.rst
-+++ b/Documentation/arch/mips/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features mips
-+.. kernel-feat:: $srctree/Documentation/features mips
-diff --git a/Documentation/arch/nios2/features.rst b/Documentation/arch/nios2/features.rst
-index 89913810ccb5..8449e63f69b2 100644
---- a/Documentation/arch/nios2/features.rst
-+++ b/Documentation/arch/nios2/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features nios2
-+.. kernel-feat:: $srctree/Documentation/features nios2
-diff --git a/Documentation/arch/openrisc/features.rst b/Documentation/arch/openrisc/features.rst
-index bae2e25adfd6..3f7c40d219f2 100644
---- a/Documentation/arch/openrisc/features.rst
-+++ b/Documentation/arch/openrisc/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features openrisc
-+.. kernel-feat:: $srctree/Documentation/features openrisc
-diff --git a/Documentation/arch/parisc/features.rst b/Documentation/arch/parisc/features.rst
-index b3aa4d243b93..501d7c450037 100644
---- a/Documentation/arch/parisc/features.rst
-+++ b/Documentation/arch/parisc/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features parisc
-+.. kernel-feat:: $srctree/Documentation/features parisc
-diff --git a/Documentation/arch/s390/features.rst b/Documentation/arch/s390/features.rst
-index 2883dc950681..57c296a9d8f3 100644
---- a/Documentation/arch/s390/features.rst
-+++ b/Documentation/arch/s390/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features s390
-+.. kernel-feat:: $srctree/Documentation/features s390
-diff --git a/Documentation/arch/sh/features.rst b/Documentation/arch/sh/features.rst
-index fae48fe81e9b..f722af3b6c99 100644
---- a/Documentation/arch/sh/features.rst
-+++ b/Documentation/arch/sh/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features sh
-+.. kernel-feat:: $srctree/Documentation/features sh
-diff --git a/Documentation/arch/sparc/features.rst b/Documentation/arch/sparc/features.rst
-index 96835b6d598a..c0c92468b0fe 100644
---- a/Documentation/arch/sparc/features.rst
-+++ b/Documentation/arch/sparc/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features sparc
-+.. kernel-feat:: $srctree/Documentation/features sparc
-diff --git a/Documentation/arch/x86/features.rst b/Documentation/arch/x86/features.rst
-index a33616346a38..b663f15053ce 100644
---- a/Documentation/arch/x86/features.rst
-+++ b/Documentation/arch/x86/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features x86
-+.. kernel-feat:: $srctree/Documentation/features x86
-diff --git a/Documentation/arch/xtensa/features.rst b/Documentation/arch/xtensa/features.rst
-index 28dcce1759be..6b92c7bfa19d 100644
---- a/Documentation/arch/xtensa/features.rst
-+++ b/Documentation/arch/xtensa/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features xtensa
-+.. kernel-feat:: $srctree/Documentation/features xtensa
-diff --git a/Documentation/powerpc/features.rst b/Documentation/powerpc/features.rst
-index ee4b95e04202..aeae73df86b0 100644
---- a/Documentation/powerpc/features.rst
-+++ b/Documentation/powerpc/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features powerpc
-+.. kernel-feat:: $srctree/Documentation/features powerpc
-diff --git a/Documentation/riscv/features.rst b/Documentation/riscv/features.rst
-index 36e90144adab..c70ef6ac2368 100644
---- a/Documentation/riscv/features.rst
-+++ b/Documentation/riscv/features.rst
-@@ -1,3 +1,3 @@
- .. SPDX-License-Identifier: GPL-2.0
-
--.. kernel-feat:: features riscv
-+.. kernel-feat:: $srctree/Documentation/features riscv
-diff --git a/Documentation/sphinx/kernel_feat.py b/Documentation/sphinx/kernel_feat.py
-index bdfaa3e4b202..27b701ed3681 100644
---- a/Documentation/sphinx/kernel_feat.py
-+++ b/Documentation/sphinx/kernel_feat.py
-@@ -37,6 +37,8 @@ import re
- import subprocess
- import sys
-
-+from os import path
-+
- from docutils import nodes, statemachine
- from docutils.statemachine import ViewList
- from docutils.parsers.rst import directives, Directive
-@@ -74,26 +76,33 @@ class KernelFeat(Directive):
- self.state.document.settings.env.app.warn(message, prefix="")
-
- def run(self):
-+
- doc = self.state.document
- if not doc.settings.file_insertion_enabled:
- raise self.warning("docutils: file insertion disabled")
-
- env = doc.settings.env
-+ cwd = path.dirname(doc.current_source)
-+ cmd = "get_feat.pl rest --enable-fname --dir "
-+ cmd += self.arguments[0]
-+
-+ if len(self.arguments) > 1:
-+ cmd += " --arch " + self.arguments[1]
-
-- srctree = os.path.abspath(os.environ["srctree"])
-+ srctree = path.abspath(os.environ["srctree"])
-
-- args = [
-- os.path.join(srctree, 'scripts/get_feat.pl'),
-- 'rest',
-- '--enable-fname',
-- '--dir',
-- os.path.join(srctree, 'Documentation', self.arguments[0]),
-- ]
-+ fname = cmd
-
-- if len(self.arguments) > 1:
-- args.extend(['--arch', self.arguments[1]])
-+ # extend PATH with $(srctree)/scripts
-+ path_env = os.pathsep.join([
-+ srctree + os.sep + "scripts",
-+ os.environ["PATH"]
-+ ])
-+ shell_env = os.environ.copy()
-+ shell_env["PATH"] = path_env
-+ shell_env["srctree"] = srctree
-
-- lines = subprocess.check_output(args, cwd=os.path.dirname(doc.current_source)).decode('utf-8')
-+ lines = self.runCmd(cmd, shell=True, cwd=cwd, env=shell_env)
-
- line_regex = re.compile("^\.\. FILE (\S+)$")
-
-@@ -112,6 +121,30 @@ class KernelFeat(Directive):
- nodeList = self.nestedParse(out_lines, fname)
- return nodeList
-
-+ def runCmd(self, cmd, **kwargs):
-+ u"""Run command ``cmd`` and return its stdout as unicode."""
-+
-+ try:
-+ proc = subprocess.Popen(
-+ cmd
-+ , stdout = subprocess.PIPE
-+ , stderr = subprocess.PIPE
-+ , **kwargs
-+ )
-+ out, err = proc.communicate()
-+
-+ out, err = codecs.decode(out, 'utf-8'), codecs.decode(err, 'utf-8')
-+
-+ if proc.returncode != 0:
-+ raise self.severe(
-+ u"command '%s' failed with return code %d"
-+ % (cmd, proc.returncode)
-+ )
-+ except OSError as exc:
-+ raise self.severe(u"problems with '%s' directive: %s."
-+ % (self.name, ErrorString(exc)))
-+ return out
-+
- def nestedParse(self, lines, fname):
- content = ViewList()
- node = nodes.section()
-diff --git a/Documentation/translations/zh_CN/arch/loongarch/features.rst b/Documentation/translations/zh_CN/arch/loongarch/features.rst
-index cec38dda8298..82bfac180bdc 100644
---- a/Documentation/translations/zh_CN/arch/loongarch/features.rst
-+++ b/Documentation/translations/zh_CN/arch/loongarch/features.rst
-@@ -5,4 +5,4 @@
- :Original: Documentation/arch/loongarch/features.rst
- :Translator: Huacai Chen <chenhuacai@loongson.cn>
-
--.. kernel-feat:: features loongarch
-+.. kernel-feat:: $srctree/Documentation/features loongarch
-diff --git a/Documentation/translations/zh_CN/arch/mips/features.rst b/Documentation/translations/zh_CN/arch/mips/features.rst
-index 0d6df97db069..da1b956e4a40 100644
---- a/Documentation/translations/zh_CN/arch/mips/features.rst
-+++ b/Documentation/translations/zh_CN/arch/mips/features.rst
-@@ -10,4 +10,4 @@
-
- .. _cn_features:
-
--.. kernel-feat:: features mips
-+.. kernel-feat:: $srctree/Documentation/features mips
---
-2.43.0
-
diff --git a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
index 205510d6bf..32d158cc2a 100644
--- a/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
+++ b/debian/patches/debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
@@ -18,7 +18,7 @@ Index: linux/kernel/fork.c
===================================================================
--- linux.orig/kernel/fork.c
+++ linux/kernel/fork.c
-@@ -108,6 +108,11 @@
+@@ -110,6 +110,11 @@
#define CREATE_TRACE_POINTS
#include <trace/events/task.h>
@@ -30,7 +30,7 @@ Index: linux/kernel/fork.c
/*
* Minimum number of threads to boot the kernel
-@@ -2008,6 +2013,10 @@ static __latent_entropy struct task_stru
+@@ -2265,6 +2270,10 @@ static __latent_entropy struct task_stru
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
return ERR_PTR(-EINVAL);
@@ -41,7 +41,7 @@ Index: linux/kernel/fork.c
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -3166,6 +3175,12 @@ int ksys_unshare(unsigned long unshare_f
+@@ -3411,6 +3420,12 @@ int ksys_unshare(unsigned long unshare_f
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -58,7 +58,7 @@ Index: linux/kernel/sysctl.c
===================================================================
--- linux.orig/kernel/sysctl.c
+++ linux/kernel/sysctl.c
-@@ -136,6 +136,10 @@ static enum sysctl_writes_mode sysctl_wr
+@@ -135,6 +135,10 @@ static enum sysctl_writes_mode sysctl_wr
int sysctl_legacy_va_layout;
#endif
@@ -69,7 +69,7 @@ Index: linux/kernel/sysctl.c
#endif /* CONFIG_SYSCTL */
/*
-@@ -1659,6 +1663,15 @@ static struct ctl_table kern_table[] = {
+@@ -1623,6 +1627,15 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
@@ -96,6 +96,6 @@ Index: linux/kernel/user_namespace.c
+/* sysctl */
+int unprivileged_userns_clone = 1;
+
- static struct kmem_cache *user_ns_cachep __read_mostly;
+ static struct kmem_cache *user_ns_cachep __ro_after_init;
static DEFINE_MUTEX(userns_state_mutex);
diff --git a/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch b/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
deleted file mode 100644
index 3bf7ca6b33..0000000000
--- a/debian/patches/debian/dfsg/drivers-net-appletalk-cops.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Frederik Schüler <fs@debian.org>
-Date: Fri, 05 Jan 2007 15:55:24 +0000
-Subject: Add removal patches for: 3c359, smctr, keyspan, cops
-Forwarded: not-needed
-
----
- drivers/net/appletalk/Kconfig | 26 --------------------------
- drivers/net/appletalk/Makefile | 1 -
- 2 files changed, 27 deletions(-)
-
---- a/drivers/net/appletalk/Kconfig
-+++ b/drivers/net/appletalk/Kconfig
-@@ -39,35 +39,6 @@ config DEV_APPLETALK
- connect to the AppleTalk network, say Y.
-
-
--config COPS
-- tristate "COPS LocalTalk PC support"
-- depends on DEV_APPLETALK && ISA
-- depends on NETDEVICES
-- select NETDEV_LEGACY_INIT
-- help
-- This allows you to use COPS AppleTalk cards to connect to LocalTalk
-- networks. You also need version 1.3.3 or later of the netatalk
-- package. This driver is experimental, which means that it may not
-- work. This driver will only work if you choose "AppleTalk DDP"
-- networking support, above.
-- Please read the file
-- <file:Documentation/networking/device_drivers/appletalk/cops.rst>.
--
--config COPS_DAYNA
-- bool "Dayna firmware support"
-- depends on COPS
-- help
-- Support COPS compatible cards with Dayna style firmware (Dayna
-- DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC
-- III, Farallon PhoneNET PC II).
--
--config COPS_TANGENT
-- bool "Tangent firmware support"
-- depends on COPS
-- help
-- Support COPS compatible cards with Tangent style firmware (Tangent
-- ATB_II, Novell NL-1000, Daystar Digital LT-200.
--
- config IPDDP
- tristate "Appletalk-IP driver support"
- depends on DEV_APPLETALK && ATALK
---- a/drivers/net/appletalk/Makefile
-+++ b/drivers/net/appletalk/Makefile
-@@ -4,4 +4,3 @@
- #
-
- obj-$(CONFIG_IPDDP) += ipddp.o
--obj-$(CONFIG_COPS) += cops.o
diff --git a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
index cbef215c16..5f1258c910 100644
--- a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
+++ b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
@@ -15,7 +15,7 @@ probably discontinued 10 years ago.
---
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
-@@ -882,101 +882,6 @@ config FB_ATMEL
+@@ -690,102 +690,6 @@ config FB_ATMEL
help
This enables support for the AT91 LCD Controller.
@@ -23,10 +23,10 @@ probably discontinued 10 years ago.
- tristate "nVidia Framebuffer Support"
- depends on FB && PCI
- select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT
-- select FB_MODE_HELPERS
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
+- select FB_IOMEM_FOPS
- select BITREVERSE
- select VGASTATE
- select VIDEO_NOMODESET
@@ -71,10 +71,11 @@ probably discontinued 10 years ago.
- tristate "nVidia Riva support"
- depends on FB && PCI
- select FB_BACKLIGHT if FB_RIVA_BACKLIGHT
-- select FB_MODE_HELPERS
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
+- select FB_IOMEM_FOPS
+- select FB_MODE_HELPERS
- select BITREVERSE
- select VGASTATE
- select VIDEO_NOMODESET
@@ -119,7 +120,7 @@ probably discontinued 10 years ago.
depends on FB && PCI
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
-@@ -21,8 +21,6 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o
+@@ -22,8 +22,6 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o
obj-$(CONFIG_FB_I740) += i740fb.o
obj-$(CONFIG_FB_MATROX) += matrox/
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 4be8009d88..3f7334b812 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -9,8 +9,8 @@ Index: linux/.gitignore
===================================================================
--- linux.orig/.gitignore
+++ linux/.gitignore
-@@ -77,11 +77,6 @@ modules.order
- /kernel.spec
+@@ -76,11 +76,6 @@ modules.order
+ #
/rpmbuild/
-#
@@ -21,7 +21,7 @@ Index: linux/.gitignore
#
# Snap directory (make snap-pkg)
#
-@@ -92,18 +87,6 @@ modules.order
+@@ -91,18 +86,6 @@ modules.order
#
/tar-install/
@@ -40,7 +40,7 @@ Index: linux/.gitignore
#
# Generated include files
#
-@@ -170,3 +153,10 @@ sphinx_*/
+@@ -169,3 +152,10 @@ sphinx_*/
# Rust analyzer configuration
/rust-project.json
diff --git a/debian/patches/debian/ia64-hardcode-arch-script-output.patch b/debian/patches/debian/ia64-hardcode-arch-script-output.patch
deleted file mode 100644
index 79356c4900..0000000000
--- a/debian/patches/debian/ia64-hardcode-arch-script-output.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: dann frazier <dannf@debian.org>
-Subject: Hardcode arch script output
-Date: Mon, 26 Mar 2007 16:30:51 -0600
-Bug-Debian: https://bugs.debian.org/392592
-Forwarded: not-needed
-
-Here's a patch that simply uses hardcoded definitions instead of
-doing the dynamic tests that require architecture-specific scripts.
-
-I don't particularly like this approach because it restricts
-portability and diverts from upstream. But, it is simpler, and this
-really needs to be fixed somehow before etch (along with a rebuild of
-linux-modules-extra-2.6), so I'm willing to live with it if my other
-patch is deemed unacceptable.
-
-My primary concern is that, in the future, the output of these scripts
-will change and we (or our successors) will either not notice or
-forget to update the hardcoded values.
-
-Including the scripts in linux-kbuild will avoid this manual step
-altogether, and allow for the possibility of other archs to provide
-their own scripts in the future.
----
- arch/ia64/Makefile | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
---- a/arch/ia64/Makefile
-+++ b/arch/ia64/Makefile
-@@ -26,16 +26,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -
- -frename-registers -fno-optimize-sibling-calls
- KBUILD_CFLAGS_KERNEL := -mconstant-gp
-
--GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
--KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
--
--ifeq ($(GAS_STATUS),buggy)
--$(error Sorry, you need a newer version of the assember, one that is built from \
-- a source-tree that post-dates 18-Dec-2002. You can find a pre-compiled \
-- static binary of such an assembler at: \
-- \
-- ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
--endif
-+KBUILD_CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE
-
- quiet_cmd_gzip = GZIP $@
- cmd_gzip = cat $(real-prereqs) | $(KGZIP) -n -f -9 > $@
-@@ -52,7 +42,7 @@ drivers-y += arch/ia64/pci/ arch/ia64/
-
- PHONY += compressed check
-
--all: compressed unwcheck
-+all: compressed
-
- compressed: vmlinux.gz
-
-@@ -64,9 +54,6 @@ vmlinux.gz: vmlinux.bin FORCE
- vmlinux.bin: vmlinux FORCE
- $(call if_changed,objcopy)
-
--unwcheck: vmlinux
-- -$(Q)READELF=$(READELF) $(PYTHON3) $(srctree)/arch/ia64/scripts/unwcheck.py $<
--
- archheaders:
- $(Q)$(MAKE) $(build)=arch/ia64/kernel/syscalls all
-
-@@ -78,5 +66,4 @@ install: vmlinux.gz
- define archhelp
- echo '* compressed - Build compressed kernel image'
- echo ' install - Install compressed kernel image'
-- echo '* unwcheck - Check vmlinux for invalid unwind info'
- endef
diff --git a/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch b/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch
index eea69e4558..174199c4c7 100644
--- a/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch
+++ b/debian/patches/debian/kbuild-look-for-module.lds-under-arch-directory-too.patch
@@ -22,26 +22,29 @@ Therefore, we move module.lds under the arch build directory in
rules.real and change Makefile.modfinal to look for it in both places.
---
-Index: linux/scripts/Makefile.modfinal
-===================================================================
---- linux.orig/scripts/Makefile.modfinal
-+++ linux/scripts/Makefile.modfinal
-@@ -29,12 +29,13 @@ quiet_cmd_cc_o_c = CC [M] $@
+ scripts/Makefile.modfinal | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal
+index 8568d256d6fb..415cff66539b 100644
+--- a/scripts/Makefile.modfinal
++++ b/scripts/Makefile.modfinal
+@@ -28,11 +28,13 @@ quiet_cmd_cc_o_c = CC [M] $@
+ %.mod.o: %.mod.c FORCE
$(call if_changed_dep,cc_o_c)
- ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
+ARCH_MODULE_LDS := $(word 1,$(wildcard scripts/module.lds arch/$(SRCARCH)/module.lds))
-
++
quiet_cmd_ld_ko_o = LD [M] $@
cmd_ld_ko_o += \
$(LD) -r $(KBUILD_LDFLAGS) \
$(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
-- -T scripts/module.lds -o $@ $(filter %.o, $^); \
-+ -T $(ARCH_MODULE_LDS) -o $@ $(filter %.o, $^); \
- $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
+- -T scripts/module.lds -o $@ $(filter %.o, $^)
++ -T $(ARCH_MODULE_LDS) -o $@ $(filter %.o, $^)
quiet_cmd_btf_ko = BTF [M] $@
-@@ -57,7 +58,7 @@ if_changed_except = $(if $(call newer_pr
+ cmd_btf_ko = \
+@@ -52,7 +54,7 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \
printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
# Re-generate module BTFs if either module's .ko or vmlinux changed
@@ -50,3 +53,5 @@ Index: linux/scripts/Makefile.modfinal
+$(call if_changed_except,ld_ko_o,vmlinux)
ifdef CONFIG_DEBUG_INFO_BTF_MODULES
+$(if $(newer-prereqs),$(call cmd,btf_ko))
+--
+2.42.0
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 7f80a9dd0a..6cc13c7be4 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -8,12 +8,11 @@ $DISTRIBUTION_OFFICIAL_BUILD, $DISTRIBUTOR and $DISTRIBUTION_VERSION
are set.
---
Makefile | 15 ++++++++++++++-
- arch/ia64/kernel/process.c | 5 +++--
arch/powerpc/kernel/process.c | 6 ++++--
arch/x86/um/sysrq_64.c | 6 ++++--
kernel/hung_task.c | 6 ++++--
lib/dump_stack.c | 6 ++++--
- 6 files changed, 33 insertions(+), 11 deletions(-)
+ 5 files changed, 30 insertions(+), 9 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -54,28 +53,6 @@ are set.
PHONY += headerdep
headerdep:
$(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \
---- a/arch/ia64/kernel/process.c
-+++ b/arch/ia64/kernel/process.c
-@@ -35,6 +35,7 @@
- #include <linux/utsname.h>
- #include <linux/resume_user_mode.h>
- #include <linux/rcupdate.h>
-+#include <generated/package.h>
-
- #include <asm/cpu.h>
- #include <asm/delay.h>
-@@ -102,9 +103,9 @@ show_regs (struct pt_regs *regs)
- print_modules();
- printk("\n");
- show_regs_print_info(KERN_DEFAULT);
-- printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
-+ printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s%s)\n",
- regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
-- init_utsname()->release);
-+ init_utsname()->release, LINUX_PACKAGE_ID);
- printk("ip is at %pS\n", (void *)ip);
- printk("unat: %016lx pfs : %016lx rsc : %016lx\n",
- regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -38,6 +38,7 @@
diff --git a/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch b/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch
new file mode 100644
index 0000000000..4c4be6b22a
--- /dev/null
+++ b/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch
@@ -0,0 +1,35 @@
+From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Date: Wed, 22 Nov 2023 10:33:33 +0100
+Subject: driver core: Emit reason for pending deferred probe
+Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=7c41da586e9f45bf8842b4dca08681df8d586ebb
+
+Ending a boot log with
+
+ platform 3f202000.mmc: deferred probe pending
+
+is already a nice hint about the problem. Sometimes there is a more
+detailed error indicator available, add that to the output.
+
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Link: https://lore.kernel.org/r/20231122093332.274145-2-u.kleine-koenig@pengutronix.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/base/dd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/base/dd.c b/drivers/base/dd.c
+index 0c3725c3eefa..85152537dbf1 100644
+--- a/drivers/base/dd.c
++++ b/drivers/base/dd.c
+@@ -313,7 +313,7 @@ static void deferred_probe_timeout_work_func(struct work_struct *work)
+
+ mutex_lock(&deferred_probe_mutex);
+ list_for_each_entry(p, &deferred_probe_pending_list, deferred_probe)
+- dev_info(p->device, "deferred probe pending\n");
++ dev_info(p->device, "deferred probe pending: %s", p->deferred_probe_reason ?: "(reason unknown)\n");
+ mutex_unlock(&deferred_probe_mutex);
+
+ fw_devlink_probing_done();
+--
+2.43.0
+
diff --git a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch
index 16cac663c1..a4576e75f4 100644
--- a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch
+++ b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch
@@ -49,8 +49,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
depends on BROKEN && X86
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
-@@ -283,14 +283,14 @@ static LIST_HEAD(dmar_satc_units);
- static void device_block_translation(struct device *dev);
+@@ -284,14 +284,14 @@ static LIST_HEAD(dmar_satc_units);
+
static void intel_iommu_domain_free(struct iommu_domain *domain);
-int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON);
@@ -66,7 +66,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;
-@@ -328,6 +328,7 @@ static int __init intel_iommu_setup(char
+@@ -333,6 +333,7 @@ static int __init intel_iommu_setup(char
while (*str) {
if (!strncmp(str, "on", 2)) {
dmar_disabled = 0;
diff --git a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch
index a3543d90e9..6950c937d5 100644
--- a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch
+++ b/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
-@@ -2053,6 +2053,8 @@
+@@ -2122,6 +2122,8 @@
bypassed by not enabling DMAR with this option. In
this case, gfx device will use physical address for
DMA.
@@ -33,7 +33,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
sp_off [Default Off]
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
-@@ -35,6 +35,9 @@
+@@ -36,6 +36,9 @@
#define CONTEXT_SIZE VTD_PAGE_SIZE
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
@@ -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)
-@@ -293,12 +296,14 @@ int intel_iommu_enabled = 0;
+@@ -291,12 +294,14 @@ int intel_iommu_enabled = 0;
EXPORT_SYMBOL_GPL(intel_iommu_enabled);
static int dmar_map_gfx = 1;
@@ -57,8 +57,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+#define IDENTMAP_INTGPU 8
const struct iommu_ops intel_iommu_ops;
-
-@@ -337,6 +342,9 @@ static int __init intel_iommu_setup(char
+ static const struct iommu_dirty_ops intel_dirty_ops;
+@@ -336,6 +341,9 @@ static int __init intel_iommu_setup(char
} else if (!strncmp(str, "igfx_off", 8)) {
dmar_map_gfx = 0;
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;
-@@ -2582,6 +2590,9 @@ static int device_def_domain_type(struct
+@@ -2548,6 +2556,9 @@ static int device_def_domain_type(struct
if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
return IOMMU_DOMAIN_IDENTITY;
@@ -78,7 +78,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
}
return 0;
-@@ -2985,6 +2996,9 @@ static int __init init_dmars(void)
+@@ -2855,6 +2866,9 @@ static int __init init_dmars(void)
if (!dmar_map_gfx)
iommu_identity_mapping |= IDENTMAP_GFX;
diff --git a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch b/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
index 010fa59105..c77b75f36d 100644
--- a/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
+++ b/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
-@@ -6172,6 +6172,10 @@
+@@ -6410,6 +6410,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
-@@ -3058,6 +3058,14 @@ config COMPAT_32
+@@ -3024,6 +3024,14 @@ config COMPAT_32
select HAVE_UID16
select OLD_SIGSUSPEND3
@@ -59,7 +59,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
depends on IA32_EMULATION || X86_X32_ABI
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
-@@ -62,7 +62,7 @@ static __always_inline bool do_syscall_x
+@@ -63,7 +63,7 @@ static __always_inline bool do_syscall_x
*/
unsigned int xnr = nr - __X32_SYSCALL_BIT;
@@ -129,7 +129,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+arch_param_cb(x32, &x32_param_ops, NULL, 0444);
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
-@@ -11,6 +11,9 @@
+@@ -12,6 +12,9 @@
#include <asm/user.h>
#include <asm/auxvec.h>
#include <asm/fsgsbase.h>
@@ -142,7 +142,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
@@ -150,7 +153,8 @@ do { \
#define compat_elf_check_arch(x) \
- (elf_check_arch_ia32(x) || \
+ ((elf_check_arch_ia32(x) && ia32_enabled()) || \
- (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
+ (IS_ENABLED(CONFIG_X86_X32_ABI) && x32_enabled && \
+ (x)->e_machine == EM_X86_64))
diff --git a/debian/patches/series b/debian/patches/series
index 9401d26da0..8c1ff52363 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ debian/gitignore.patch
# Disable features broken by exclusion of upstream files
debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-debian/dfsg/drivers-net-appletalk-cops.patch
debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
debian/dfsg/documentation-fix-broken-link-to-cipso-draft.patch
@@ -11,7 +10,6 @@ debian/dfsg/documentation-fix-broken-link-to-cipso-draft.patch
debian/version.patch
debian/uname-version-timestamp.patch
debian/kernelvariables.patch
-debian/ia64-hardcode-arch-script-output.patch
debian/mips-disable-werror.patch
debian/mips-boston-disable-its.patch
debian/mips-ieee754-relaxed.patch
@@ -78,9 +76,9 @@ features/x86/x86-make-x32-syscall-support-conditional.patch
# Miscellaneous bug fixes
bugfix/all/disable-some-marvell-phys.patch
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
-debian/Revert-docs-kernel_feat.py-fix-potential-command-inj.patch
# Miscellaneous features
+features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch
# Lockdown missing pieces
features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch