diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6719de2e3468..b3850d086880 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -23,26 +23,11 @@ patch = ./bridge-stp-helper.patch; }; - # Reverts the buggy commit causing https://bugzilla.kernel.org/show_bug.cgi?id=217802 - dell_xps_regression = { - name = "dell_xps_regression"; - patch = fetchpatch { - name = "Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; - url = "https://raw.githubusercontent.com/openSUSE/kernel-source/1b02b1528a26f4e9b577e215c114d8c5e773ee10/patches.suse/Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; - sha256 = "sha256-RHJdQ4p0msTOVPR+/dYiKuwwEoG9IpIBqT4dc5cJjf8="; - }; - }; - request_key_helper = { name = "request-key-helper"; patch = ./request-key-helper.patch; }; - request_key_helper_updated = { - name = "request-key-helper-updated"; - patch = ./request-key-helper-updated.patch; - }; - hardened = let mkPatch = @@ -65,13 +50,6 @@ in lib.mapAttrs mkPatch patches; - # Adapted for Linux 5.4 from: - # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45 - rtl8761b_support = { - name = "rtl8761b-support"; - patch = ./rtl8761b-support.patch; - }; - export-rt-sched-migrate = { name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; diff --git a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch deleted file mode 100644 index aabb9e801be4..000000000000 --- a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/security/keys/request_key.c b/security/keys/request_key.c -index 88172c163953..4da74a1eebb2 100644 ---- a/security/keys/request_key.c -+++ b/security/keys/request_key.c -@@ -161,7 +161,7 @@ static int call_sbin_request_key(struct key_construction *cons, - - /* set up the argument list */ - i = 0; -- argv[i++] = "/sbin/request-key"; -+ argv[i++] = "/run/current-system/sw/bin/request-key"; - argv[i++] = (char *) op; - argv[i++] = key_str; - argv[i++] = uid_str; diff --git a/pkgs/os-specific/linux/kernel/rtl8761b-support.patch b/pkgs/os-specific/linux/kernel/rtl8761b-support.patch deleted file mode 100644 index b6d80d5bc8d3..000000000000 --- a/pkgs/os-specific/linux/kernel/rtl8761b-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c -index 67f4bc21e7c5..3a9afc905f24 100644 ---- a/drivers/bluetooth/btrtl.c -+++ b/drivers/bluetooth/btrtl.c -@@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { - .cfg_name = "rtl_bt/rtl8821c_config" }, - - /* 8761A */ -- { IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0, -+ { IC_INFO(RTL_ROM_LMP_8761A, 0xa), - .config_needed = false, - .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761a_fw.bin", - .cfg_name = "rtl_bt/rtl8761a_config" }, - -+ /* 8761B */ -+ { IC_INFO(RTL_ROM_LMP_8761A, 0xb), -+ .config_needed = false, -+ .has_rom_version = true, -+ .fw_name = "rtl_bt/rtl8761b_fw.bin", -+ .cfg_name = "rtl_bt/rtl8761b_config" }, -+ - /* 8822C with USB interface */ - { IC_INFO(RTL_ROM_LMP_8822B, 0xc), - .config_needed = false, -@@ -251,6 +258,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, - { RTL_ROM_LMP_8723B, 9 }, /* 8723D */ - { RTL_ROM_LMP_8821A, 10 }, /* 8821C */ - { RTL_ROM_LMP_8822B, 13 }, /* 8822C */ -+ { RTL_ROM_LMP_8761A, 14 }, /* 8761B */ - }; - - min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;