Refresh various patches that are just a little fuzzy

4 files changed, 26 insertions, 30 deletions

diff --git a/debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch b/debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
index e58620055..4ff66b31c 100644
--- a/debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
+++ b/debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
@@ -30,7 +30,7 @@ is missing, except for the pre-R600 case.
 
 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-@@ -40,6 +40,8 @@
+@@ -39,6 +39,8 @@
  #include <linux/suspend.h>
  #include <linux/cc_platform.h>
  #include <linux/fb.h>
@@ -39,8 +39,8 @@ is missing, except for the pre-R600 case.
  
  #include "amdgpu.h"
  #include "amdgpu_irq.h"
-@@ -1911,6 +1913,28 @@ static bool amdgpu_is_fw_framebuffer(res
- 	return found;
+@@ -1992,6 +1994,28 @@ static void amdgpu_get_secondary_funcs(s
+ 	}
  }
  
 +/* Test that /lib/firmware/amdgpu is a directory (or symlink to a
@@ -68,7 +68,7 @@ is missing, except for the pre-R600 case.
  static int amdgpu_pci_probe(struct pci_dev *pdev,
  			    const struct pci_device_id *ent)
  {
-@@ -1993,6 +2017,11 @@ static int amdgpu_pci_probe(struct pci_d
+@@ -2072,6 +2096,11 @@ static int amdgpu_pci_probe(struct pci_d
  	size = pci_resource_len(pdev, 0);
  	is_fw_fb = amdgpu_is_fw_framebuffer(base, size);
  
@@ -82,7 +82,7 @@ is missing, except for the pre-R600 case.
  	if (ret)
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -49,6 +49,8 @@
+@@ -48,6 +48,8 @@
  #include <drm/drm_probe_helper.h>
  #include <drm/drm_vblank.h>
  #include <drm/radeon_drm.h>
@@ -91,7 +91,7 @@ is missing, except for the pre-R600 case.
  
  #include "radeon_drv.h"
  #include "radeon.h"
-@@ -289,6 +291,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
+@@ -288,6 +290,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
  
  static const struct drm_driver kms_driver;
  
@@ -120,7 +120,7 @@ is missing, except for the pre-R600 case.
  static int radeon_pci_probe(struct pci_dev *pdev,
  			    const struct pci_device_id *ent)
  {
-@@ -329,6 +353,12 @@ static int radeon_pci_probe(struct pci_d
+@@ -328,6 +352,12 @@ static int radeon_pci_probe(struct pci_d
  	if (vga_switcheroo_client_probe_defer(pdev))
  		return -EPROBE_DEFER;
  
diff --git a/debian/patches/debian/sched-autogroup-disabled.patch b/debian/patches/debian/sched-autogroup-disabled.patch
index e9988022e..c616fa46e 100644
--- a/debian/patches/debian/sched-autogroup-disabled.patch
+++ b/debian/patches/debian/sched-autogroup-disabled.patch
@@ -8,9 +8,9 @@ it by default yet.
 
 --- a/kernel/sched/autogroup.c
 +++ b/kernel/sched/autogroup.c
-@@ -5,7 +5,7 @@
- #include <linux/nospec.h>
- #include "sched.h"
+@@ -4,7 +4,7 @@
+  * Auto-group scheduling implementation:
+  */
  
 -unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
 +unsigned int __read_mostly sysctl_sched_autogroup_enabled = 0;
diff --git a/debian/patches/features/all/db-mok-keyring/0004-MODSIGN-check-the-attributes-of-db-and-mok.patch b/debian/patches/features/all/db-mok-keyring/0004-MODSIGN-check-the-attributes-of-db-and-mok.patch
index e3e71d05e..69f9438dc 100644
--- a/debian/patches/features/all/db-mok-keyring/0004-MODSIGN-check-the-attributes-of-db-and-mok.patch
+++ b/debian/patches/features/all/db-mok-keyring/0004-MODSIGN-check-the-attributes-of-db-and-mok.patch
@@ -33,7 +33,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
 
 --- a/security/integrity/platform_certs/load_uefi.c
 +++ b/security/integrity/platform_certs/load_uefi.c
-@@ -35,11 +35,13 @@ static __init bool uefi_check_ignore_db(
+@@ -36,11 +36,13 @@ static __init bool uefi_check_ignore_db(
   * Get a certificate list blob from the named EFI variable.
   */
  static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
@@ -48,7 +48,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  
  	*status = efi.get_variable(name, guid, NULL, &lsize, &tmpdb);
  	if (*status == EFI_NOT_FOUND)
-@@ -54,13 +56,22 @@ static __init void *get_cert_list(efi_ch
+@@ -55,13 +57,22 @@ static __init void *get_cert_list(efi_ch
  	if (!db)
  		return NULL;
  
@@ -72,7 +72,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  	*size = lsize;
  	return db;
  }
-@@ -106,7 +117,8 @@ static int __init load_moklist_certs(voi
+@@ -107,7 +118,8 @@ static int __init load_moklist_certs(voi
  	/* Get MokListRT. It might not exist, so it isn't an error
  	 * if we can't get it.
  	 */
@@ -81,8 +81,8 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
 +				0, EFI_VARIABLE_NON_VOLATILE);
  	if (mok) {
  		rc = parse_efi_signature_list("UEFI:MokListRT",
- 					      mok, moksize, get_handler_for_db);
-@@ -145,7 +157,8 @@ static int __init load_uefi_certs(void)
+ 					      mok, moksize, get_handler_for_mok);
+@@ -146,7 +158,8 @@ static int __init load_uefi_certs(void)
  	 * if we can't get them.
  	 */
  	if (!uefi_check_ignore_db()) {
@@ -92,7 +92,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  		if (!db) {
  			if (status == EFI_NOT_FOUND)
  				pr_debug("MODSIGN: db variable wasn't found\n");
-@@ -161,7 +174,8 @@ static int __init load_uefi_certs(void)
+@@ -162,7 +175,8 @@ static int __init load_uefi_certs(void)
  		}
  	}
  
@@ -102,7 +102,7 @@ Signed-off-by: "Lee, Chun-Yi" <jlee@suse.com>
  	if (!dbx) {
  		if (status == EFI_NOT_FOUND)
  			pr_debug("dbx variable wasn't found\n");
-@@ -180,7 +194,8 @@ static int __init load_uefi_certs(void)
+@@ -181,7 +195,8 @@ static int __init load_uefi_certs(void)
  	if (!efi_enabled(EFI_SECURE_BOOT))
  		return 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 01602a76e..ece2c44d1 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
@@ -13,11 +13,9 @@ corresponding to "on", "off", and "on,intgpu_off".
 
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
-Index: linux/drivers/iommu/intel/Kconfig
-===================================================================
---- linux.orig/drivers/iommu/intel/Kconfig
-+++ linux/drivers/iommu/intel/Kconfig
-@@ -54,14 +54,25 @@ config INTEL_IOMMU_SVM
+--- a/drivers/iommu/intel/Kconfig
++++ b/drivers/iommu/intel/Kconfig
+@@ -58,14 +58,25 @@ config INTEL_IOMMU_SVM
  	  to access DMA resources through process address space by
  	  means of a Process Address Space ID (PASID).
  
@@ -49,13 +47,11 @@ Index: linux/drivers/iommu/intel/Kconfig
  config INTEL_IOMMU_BROKEN_GFX_WA
  	bool "Workaround broken graphics drivers (going away soon)"
  	depends on BROKEN && X86
-Index: linux/drivers/iommu/intel/iommu.c
-===================================================================
---- linux.orig/drivers/iommu/intel/iommu.c
-+++ linux/drivers/iommu/intel/iommu.c
-@@ -331,14 +331,14 @@ static int intel_iommu_attach_device(str
- static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
- 					    dma_addr_t iova);
+--- a/drivers/iommu/intel/iommu.c
++++ b/drivers/iommu/intel/iommu.c
+@@ -303,14 +303,14 @@ static void domain_remove_dev_info(struc
+ static void dmar_remove_one_dev_info(struct device *dev);
+ static void __dmar_remove_one_dev_info(struct device_domain_info *info);
  
 -int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON);
 +int dmar_disabled = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_OFF);
@@ -70,7 +66,7 @@ Index: linux/drivers/iommu/intel/iommu.c
  static int intel_iommu_superpage = 1;
  static int iommu_identity_mapping;
  static int iommu_skip_te_disable;
-@@ -420,6 +420,7 @@ static int __init intel_iommu_setup(char
+@@ -378,6 +378,7 @@ static int __init intel_iommu_setup(char
  	while (*str) {
  		if (!strncmp(str, "on", 2)) {
  			dmar_disabled = 0;