Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1856184/dont-include-linux-pci-aspm.h/focal into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/focal

[You-Sheng Yang]

[You-Sheng Yang (vicamo)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f2c1e47..d4fd01b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backport-iwlwifi-dkms (8042-0ubuntu3) focal; urgency=medium
+
+  * debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
+    - Fix build on Focal v5.4 kernels. (LP: #1856184)
+
+ -- You-Sheng Yang <[e-mail]>  Fri, 13 Dec 2019 09:06:45 +0000
+
 backport-iwlwifi-dkms (8042-0ubuntu2) focal; urgency=critical
 
   * debian/gbp.conf, debian/gitlab-ci.yml
diff --git a/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch b/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
 new file mode 100644
index 0000000..ac6959a
--- /dev/null
+++ b/debian/patches/0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch
@@ -0,0 +1,32 @@
+From 7295f5fb6cc8394104a8ec39de1217048ed7a6e6 Mon Sep 17 00:00:00 2001
+From: You-Sheng Yang <[e-mail]>
+Date: Fri, 13 Dec 2019 08:54:42 +0000
+Subject: [PATCH] backport: don't include linux/pci-aspm.h on kernel >= v5.4-rc1
+
+linux/pci-aspm.h has been merged into linux/pci.h in commit 7ce2e76a0420
+("PCI: Move ASPM declarations to linux/pci.h"), and mainline iwlwifi
+removed such inclusion in commit 2b2654b8922a ("iwlwifi: Remove
+unnecessary include of <linux/pci-aspm.h>").
+
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+index 495ff9418..0fa34a93a 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+@@ -62,7 +62,9 @@
+  *
+  *****************************************************************************/
+ #include <linux/pci.h>
++#if LINUX_VERSION_IS_LESS(5,4,0)
+ #include <linux/pci-aspm.h>
++#endif
+ #include <linux/interrupt.h>
+ #include <linux/debugfs.h>
+ #include <linux/sched.h>
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 1c8cd90..9c971ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-backport-apply-__copy-to-init_module-cleanup_module.patch
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+0007-backport-don-t-include-linux-pci-aspm.h-on-kernel-v5..patch