summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch12
-rw-r--r--debian/patches/bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch9
3 files changed, 15 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d6fec2a5..45a4402fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-linux (5.2-1~exp1) UNRELEASED; urgency=medium
+linux (5.2.1-1~exp1) UNRELEASED; urgency=medium
* New upstream release: https://kernelnewbies.org/Linux_5.2
+ * New upstream stable update:
+ https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.1
+
[ Ben Hutchings ]
* Drop "x86/boot: Add ACPI RSDP address to setup_header", which should
not have been applied to 4.20 or later
@@ -30,6 +33,8 @@ linux (5.2-1~exp1) UNRELEASED; urgency=medium
- bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
- bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch
- bugfix/powerpc/powerpc-lib-makefile-don-t-pull-in-quad.o-for-32-bit.patch
+ - bugfix/all/
+ radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
- bugfix/all/disable-some-marvell-phys.patch
- debian/overlayfs-permit-mounts-in-userns.patch
- bugfix/all/tools-perf-remove-shebangs.patch
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 8477dafde..fe196945e 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
@@ -194,7 +194,7 @@ index 06749e295ada..27cd3e4121a1 100644
printk(KERN_ERR "Bogus length %d in image \"%s\"\n",
fw->size, fw_name);
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
-index 99d9f431ae2c..2116a9a6a2d2 100644
+index 4ec84a633bd3..2a1127fb22dc 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1719,11 +1719,8 @@ static void sdma_load_firmware(const struct firmware *fw, void *context)
@@ -1582,10 +1582,10 @@ index fb649d85b8fc..eb5ad93497a4 100644
}
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
-index e7c3f3b8457d..460f20f6649d 100644
+index 99f1897a775d..f615dc0039dd 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -1031,7 +1031,6 @@ static void carl9170_usb_firmware_step2(const struct firmware *fw,
+@@ -1029,7 +1029,6 @@ static void carl9170_usb_firmware_step2(const struct firmware *fw,
return;
}
@@ -1834,17 +1834,17 @@ index ab0fe8565851..9c57aab8a224 100644
ret = p54_parse_firmware(dev, priv->firmware);
if (ret) {
diff --git a/drivers/net/wireless/intersil/p54/p54usb.c b/drivers/net/wireless/intersil/p54/p54usb.c
-index f937815f0f2c..c841efab4cdc 100644
+index b94764c88750..25374d2e2fa9 100644
--- a/drivers/net/wireless/intersil/p54/p54usb.c
+++ b/drivers/net/wireless/intersil/p54/p54usb.c
-@@ -926,7 +926,6 @@ static void p54u_load_firmware_cb(const struct firmware *firmware,
+@@ -928,7 +928,6 @@ static void p54u_load_firmware_cb(const struct firmware *firmware,
err = p54u_start_ops(priv);
} else {
err = -ENOENT;
- dev_err(&udev->dev, "Firmware not found.\n");
}
- if (err) {
+ complete(&priv->fw_wait_load);
diff --git a/drivers/net/wireless/intersil/prism54/islpci_dev.c b/drivers/net/wireless/intersil/prism54/islpci_dev.c
index a9bae69222dc..1e9d25d296a9 100644
--- a/drivers/net/wireless/intersil/prism54/islpci_dev.c
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 c3f29df90..1d9365602 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
@@ -29,7 +29,7 @@ is missing, except for the pre-R600 case.
2 files changed, 59 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-index 7419ea8a388b..82df1f11cac4 100644
+index 1e2cc9d68a05..5744014f28ac 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -33,6 +33,8 @@
@@ -41,7 +41,7 @@ index 7419ea8a388b..82df1f11cac4 100644
#include "amdgpu.h"
#include "amdgpu_irq.h"
-@@ -910,6 +912,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
+@@ -929,6 +931,28 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
static struct drm_driver kms_driver;
@@ -70,7 +70,7 @@ index 7419ea8a388b..82df1f11cac4 100644
static int amdgpu_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
-@@ -928,6 +952,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
+@@ -947,6 +971,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
return -ENODEV;
}
@@ -137,6 +137,3 @@ index 2e96c886392b..1d54b3e5f489 100644
/* Get rid of things like offb */
ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "radeondrmfb");
if (ret)
---
-2.20.1
-