From 80fa61ed14f09db73db3dbd4ba4988092fa8f394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:50 +0100
Subject: [PATCH 1/6] get-sources: handle kernel-5.x

---
 Makefile | 2 +-
 version  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4eef916..fffced7 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ all: help
 
 MIRROR := cdn.kernel.org
 ifeq (,$(DISTFILES_MIRROR))
-SRC_BASEURL := https://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\(2\.[0-9]*\).*/\1/;s/^3\..*/3.x/;s/^4\..*/4.x/')
+SRC_BASEURL := https://${MIRROR}/pub/linux/kernel/v$(shell echo $(VERSION) | sed 's/^\(2\.[0-9]*\).*/\1/;s/^3\..*/3.x/;s/^4\..*/4.x/;s/^5\..*/5.x/')
 else
 SRC_BASEURL := $(DISTFILES_MIRROR)
 endif
diff --git a/version b/version
index a70a326..a1ef0ca 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.20.16
+5.0.2

From fe376beae2e508b0bf3242649eacb173cf34c285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:52 +0100
Subject: [PATCH 2/6] keys: add Fedora 30 primary key

---
 keys/RPM-GPG-KEY-fedora-30-primary | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 keys/RPM-GPG-KEY-fedora-30-primary

diff --git a/keys/RPM-GPG-KEY-fedora-30-primary b/keys/RPM-GPG-KEY-fedora-30-primary
new file mode 100644
index 0000000..f5942cd
--- /dev/null
+++ b/keys/RPM-GPG-KEY-fedora-30-primary
@@ -0,0 +1,30 @@
+pub 4096R/CFC659B9 2018-08-11 Fedora (30) <fedora-30-primary@fedoraproject.org>
+ 
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm
+bbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75
+L+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy
+KJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R
+n7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO
+4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53
+2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc
+YKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq
+SDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ
+g0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3
+DlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB
+tDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac
+g9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8
+f79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va
+N9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D
+K07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ
+Ox5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o
+8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml
+SMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7
++zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7
+CxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O
+pMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==
+=BfZ/
+-----END PGP PUBLIC KEY BLOCK-----

From 924b8ab90153dca7863b541519c54d167ab95ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:53 +0100
Subject: [PATCH 3/6] get-fedora-latest-config: don't hardcode Fedora version
 in regex rpm

---
 get-fedora-latest-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get-fedora-latest-config b/get-fedora-latest-config
index 191d7c1..ceffc53 100755
--- a/get-fedora-latest-config
+++ b/get-fedora-latest-config
@@ -20,7 +20,7 @@ url="https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everythin
 
 # get the latest kernel rpm
 content="$(curl "$url/")"
-latestrpm="$(echo "$content" | sed -e 's/<[^>]*>//g' | awk '{print $1}' | grep -E "kernel-core-[0-9]+.[0-9]+.[0-9]+-[0-9]+.fc29.x86_64.rpm")"
+latestrpm="$(echo "$content" | sed -e 's/<[^>]*>//g' | awk '{print $1}' | grep -E "kernel-core-[0-9]+.[0-9]+.[0-9]+-[0-9]+.fc$releasever.x86_64.rpm")"
 latestver="$(echo "$latestrpm" | sed 's/kernel-core-//; s/\.rpm//')"
 
 if [ "x$latestrpm" != "x" ]; then

From b935b167f868856c02a3bedab4edc0035dcb43f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:54 +0100
Subject: [PATCH 4/6] get-fedora-latest-config: allow fetching config from
 rawhide repository

---
 get-fedora-latest-config | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/get-fedora-latest-config b/get-fedora-latest-config
index ceffc53..c97eeb7 100755
--- a/get-fedora-latest-config
+++ b/get-fedora-latest-config
@@ -7,6 +7,7 @@ fi
 
 localdir="$(dirname "$(readlink -f "$0")")"
 releasever="$1"
+testing="$2"
 
 kernelver="$(cat "$localdir/version")"
 kernelsrc="linux-$kernelver"
@@ -16,7 +17,11 @@ key="$localdir/keys/RPM-GPG-KEY-fedora-$releasever-primary"
 [[ "x$releasever" == "x" ]] && { echo "Please provide Fedora release version as first argument, e.g. '29'."; exit 1; }
 
 # baseurl for latest kernel rpm
-url="https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/x86_64/Packages/k"
+if [ "$testing" == "1" ]; then
+    url="https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/x86_64/os/Packages/k"
+else
+    url="https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/x86_64/Packages/k"
+fi
 
 # get the latest kernel rpm
 content="$(curl "$url/")"

From 0643a07e2642bb518c77690bca1b0584442d1b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:55 +0100
Subject: [PATCH 5/6] Update config with respect to upstream

---
 config-base | 304 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 176 insertions(+), 128 deletions(-)

diff --git a/config-base b/config-base
index c2aff72..b249dd3 100644
--- a/config-base
+++ b/config-base
@@ -1,4 +1,4 @@
-# Base config based on Fedora's config (kernel-core-4.20.12-200.fc29.x86_64.rpm)
+# Base config based on Fedora's config (kernel-core-5.0.0-300.fc30.x86_64.rpm)
 # Only modification is `yes '' | make oldconfig` to drop config settings which
 # depend on Fedora patches and adjust for the small version difference.
 
@@ -8,6 +8,7 @@
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80201
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -19,7 +20,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="4.20.12-200.fc29.x86_64"
+CONFIG_BUILD_SALT="5.0.0-300.fc30.x86_64"
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -43,8 +44,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -283,7 +282,7 @@ CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
-CONFIG_INTEL_RDT=y
+CONFIG_X86_CPU_RESCTRL=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
@@ -312,6 +311,7 @@ CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_DEBUG_FS=y
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
@@ -475,6 +475,7 @@ CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -516,13 +517,14 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_DPTF_POWER=m
 CONFIG_ACPI_WATCHDOG=y
@@ -587,91 +589,12 @@ CONFIG_INTEL_IDLE=y
 #
 # Bus options (PCI etc.)
 #
-CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
 CONFIG_MMCONF_FAM10H=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_PTM=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=y
-CONFIG_PCI_PF_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_P2PDMA=y
-CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=y
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_VMD=m
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
 # CONFIG_X86_SYSFB is not set
 
 #
@@ -811,6 +734,7 @@ CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
@@ -878,7 +802,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_WBT=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_WBT_SQ is not set
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
@@ -917,14 +840,6 @@ CONFIG_BLK_PM=y
 #
 # IO Schedulers
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 CONFIG_IOSCHED_BFQ=m
@@ -1035,6 +950,7 @@ CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
 
 #
 # Networking options
@@ -1049,7 +965,7 @@ CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_USER=y
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_STATISTICS=y
@@ -1200,9 +1116,6 @@ CONFIG_NF_CT_NETLINK=m
 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1422,7 +1335,6 @@ CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=y
@@ -1556,6 +1468,7 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_KSZ=y
+CONFIG_NET_DSA_TAG_KSZ9477=y
 CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
@@ -1610,7 +1523,7 @@ CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_CBS=m
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
@@ -1622,7 +1535,7 @@ CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_FQ_CODEL=y
-# CONFIG_NET_SCH_CAKE is not set
+CONFIG_NET_SCH_CAKE=m
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_HHF=m
 CONFIG_NET_SCH_PIE=m
@@ -1690,6 +1603,7 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 # CONFIG_BATMAN_ADV_DEBUGFS is not set
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1912,7 +1826,7 @@ CONFIG_CEPH_LIB=m
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
@@ -1937,6 +1851,7 @@ CONFIG_NFC_MICROREAD_MEI=m
 CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
 # CONFIG_NFC_MRVL_I2C is not set
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST_NCI_I2C is not set
@@ -1961,6 +1876,89 @@ CONFIG_HAVE_EBPF_JIT=y
 #
 # Device Drivers
 #
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIE_ECRC=y
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=y
+CONFIG_PCI_PF_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_P2PDMA=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+CONFIG_VMD=m
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCI_MESON is not set
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+CONFIG_PCCARD=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_RAPIDIO is not set
 
 #
 # Generic Driver Options
@@ -2004,13 +2002,13 @@ CONFIG_PROC_EVENTS=y
 # CONFIG_GNSS is not set
 CONFIG_MTD=m
 # CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
 # Partition parsers
 #
+# CONFIG_MTD_REDBOOT_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -2139,11 +2137,13 @@ CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
 CONFIG_NVME_TARGET=m
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
 
 #
 # Misc devices
@@ -2176,6 +2176,7 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_SRAM is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=m
 # CONFIG_C2PORT is not set
 
 #
@@ -2250,6 +2251,7 @@ CONFIG_VOP=m
 CONFIG_VHOST_RING=m
 # CONFIG_GENWQE is not set
 CONFIG_ECHO=m
+CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HAVE_IDE=y
@@ -2263,7 +2265,6 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2645,8 +2646,9 @@ CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 CONFIG_NET_DSA_MT7530=m
-CONFIG_MICROCHIP_KSZ=m
-CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
@@ -2979,7 +2981,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_RENESAS_PHY=m
 # CONFIG_ROCKCHIP_PHY is not set
 CONFIG_SMSC_PHY=m
@@ -3049,6 +3051,7 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
 CONFIG_WLAN=y
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 CONFIG_ATH_COMMON=m
@@ -3301,11 +3304,12 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PEARL_PCIE=m
+CONFIG_QTNFMAC_PCIE=m
 # CONFIG_PCMCIA_RAYCS is not set
 # CONFIG_PCMCIA_WL3501 is not set
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -3422,13 +3426,6 @@ CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
 CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
 CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_CAPI=y
 CONFIG_GIGASET_BASE=m
@@ -3723,6 +3720,7 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 CONFIG_SERIO_ARC_PS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
 CONFIG_HYPERV_KEYBOARD=m
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
@@ -3965,6 +3963,7 @@ CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I3C is not set
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@@ -3986,6 +3985,7 @@ CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
@@ -4076,7 +4076,7 @@ CONFIG_GPIO_IT87=m
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA953X=m
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 
@@ -4283,6 +4283,7 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
@@ -4374,6 +4375,10 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+
+#
+# Intel thermal drivers
+#
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
@@ -4431,6 +4436,7 @@ CONFIG_NV_TCO=m
 # CONFIG_CPU5_WDT is not set
 CONFIG_SMSC_SCH311X_WDT=m
 # CONFIG_SMSC37B787_WDT is not set
+CONFIG_TQMX86_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83877F_WDT=m
@@ -4617,9 +4623,11 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_CEC_CORE=y
-CONFIG_RC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=y
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
+CONFIG_BPF_LIRC_MODE2=y
 CONFIG_RC_DECODERS=y
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
@@ -4650,6 +4658,7 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 # CONFIG_IR_SIR is not set
+# CONFIG_RC_XBOX_DVD is not set
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -4661,15 +4670,15 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
-# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_PCI_SKELETON is not set
 CONFIG_VIDEO_TUNER=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
@@ -4929,6 +4938,8 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_SECO_CEC=m
+# CONFIG_VIDEO_SECO_RC is not set
 
 #
 # Supported MMC/SDIO adapters
@@ -5394,7 +5405,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_MODE_HELPERS is not set
 CONFIG_FB_TILEBLITTING=y
 
@@ -5693,6 +5703,7 @@ CONFIG_SND_SOC_ACPI=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_DESIGNWARE_PCM=y
@@ -5724,6 +5735,13 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
@@ -5750,12 +5768,14 @@ CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 # CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# CONFIG_SND_SOC_XILINX_I2S is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -5772,7 +5792,8 @@ CONFIG_SND_SOC_ADAU1761_I2C=m
 CONFIG_SND_SOC_ADAU1761_SPI=m
 CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_AK4104 is not set
-CONFIG_SND_SOC_AK4458=m
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
 # CONFIG_SND_SOC_AK4642 is not set
@@ -5846,6 +5867,7 @@ CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_RT5670=m
 CONFIG_SND_SOC_RT5677=m
@@ -6305,6 +6327,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
 CONFIG_MMC_TIFM_SD=m
 # CONFIG_MMC_SPI is not set
 CONFIG_MMC_SDRICOH_CS=m
@@ -6352,7 +6375,7 @@ CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3601X=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
 # CONFIG_LEDS_LP5521 is not set
@@ -6404,6 +6427,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_INFINIBAND=m
@@ -6764,7 +6788,6 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 #
 # Resolver to digital converters
 #
-# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1210 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
@@ -6776,6 +6799,7 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_STAGING_MEDIA=y
 # CONFIG_I2C_BCM2048 is not set
 # CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_IPU3_IMGU is not set
 
 #
 # Android
@@ -6872,7 +6896,6 @@ CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
 CONFIG_INTEL_BXTWC_PMIC_TMU=m
 CONFIG_SURFACE_PRO3_BUTTON=m
@@ -6885,6 +6908,7 @@ CONFIG_TOUCHSCREEN_DMI=y
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_HUAWEI_WMI=m
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
@@ -7070,6 +7094,8 @@ CONFIG_MMA7660=m
 #
 # Analog to digital converters
 #
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
 # CONFIG_AD7266 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
@@ -7079,6 +7105,7 @@ CONFIG_AD7766=m
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
+CONFIG_AD7949=m
 # CONFIG_AD799X is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
@@ -7179,6 +7206,7 @@ CONFIG_LTC1660=m
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC7311=m
 
 #
 # IIO dummy driver
@@ -7300,6 +7328,7 @@ CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
+CONFIG_VCNL4035=m
 # CONFIG_VEML6070 is not set
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
@@ -7320,6 +7349,9 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
 
 #
 # Multiplexers
@@ -7349,6 +7381,7 @@ CONFIG_AD5272=m
 CONFIG_MCP4018=m
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
+CONFIG_MCP41010=m
 # CONFIG_TPL0102 is not set
 
 #
@@ -7365,7 +7398,8 @@ CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 # CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 # CONFIG_MS5611 is not set
@@ -7394,6 +7428,7 @@ CONFIG_VL53L0X_I2C=m
 #
 # Resolver to digital converters
 #
+# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
 
 #
@@ -7474,6 +7509,7 @@ CONFIG_BTT=y
 CONFIG_ND_PFN=m
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
@@ -7900,6 +7936,7 @@ CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_INTEGRITY_AUDIT=y
 CONFIG_IMA=y
 CONFIG_IMA_MEASURE_PCR_IDX=10
@@ -7914,6 +7951,7 @@ CONFIG_IMA_DEFAULT_HASH="sha1"
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA_READ_POLICY=y
 # CONFIG_IMA_APPRAISE is not set
+# CONFIG_IMA_ARCH_POLICY is not set
 CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
@@ -8001,6 +8039,10 @@ CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
 
 #
 # Hash modes
@@ -8037,6 +8079,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
@@ -8107,6 +8150,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
+CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -8155,6 +8199,7 @@ CONFIG_BINARY_PRINTF=y
 # Library routines
 #
 CONFIG_RAID6_PQ=m
+# CONFIG_RAID6_PQ_BENCHMARK is not set
 CONFIG_BITREVERSE=y
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
@@ -8180,7 +8225,7 @@ CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
-CONFIG_XXHASH=m
+CONFIG_XXHASH=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_842_COMPRESS=y
 CONFIG_842_DECOMPRESS=y
@@ -8226,7 +8271,6 @@ CONFIG_HAS_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DIRECT_OPS=y
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 CONFIG_SGL_ALLOC=y
@@ -8250,13 +8294,13 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
 # CONFIG_STRING_SELFTEST is not set
+CONFIG_OBJAGG=m
 
 #
 # Kernel hacking
@@ -8322,7 +8366,9 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8429,6 +8475,7 @@ CONFIG_KPROBE_EVENTS=y
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
@@ -8482,6 +8529,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set

From 1bedd1129e5a2b090db15a12689954b9ca8d3133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Fri, 15 Mar 2019 22:28:57 +0100
Subject: [PATCH 6/6] Update patches

---
 0001-kbuild-AFTER_LINK.patch                  |  4 +--
 0002-xen-netfront-detach-crash.patch          |  8 +++---
 ...de-EBUSY-initialization-error-on-Xen.patch | 20 +++++++-------
 ...r-code-of-EVTCHNOP_bind_pirq-failure.patch |  6 ++---
 ...movable-xenstore-flag-for-block-devi.patch | 10 +++----
 ...nt-handle-FDEJECT-as-detach-request-.patch |  6 ++---
 ...ck-add-no_part_scan-module-parameter.patch | 10 +++----
 0008-xen-Add-RING_COPY_RESPONSE.patch         |  4 +--
 ...y-response-out-of-shared-buffer-befo.patch | 26 +++++++++----------
 ...not-use-data-already-exposed-to-back.patch | 12 ++++-----
 ...t-add-range-check-for-Tx-response-id.patch |  8 +++---
 ...e-local-copy-of-response-before-usin.patch |  6 ++---
 ...pare-request-locally-only-then-put-i.patch |  6 ++---
 ...back-Update-pciif.h-with-err-and-res.patch |  4 +--
 ...attribute-to-allow-MSI-enable-flag-w.patch | 14 +++++-----
 15 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/0001-kbuild-AFTER_LINK.patch b/0001-kbuild-AFTER_LINK.patch
index 5613bab..2c10150 100644
--- a/0001-kbuild-AFTER_LINK.patch
+++ b/0001-kbuild-AFTER_LINK.patch
@@ -1,4 +1,4 @@
-From 234f2726089c1b655b0efe975a988ac6fc857b2a Mon Sep 17 00:00:00 2001
+From 59ee809914574cb2f858e94755fa17be86f34844 Mon Sep 17 00:00:00 2001
 From: Roland McGrath <roland@redhat.com>
 Date: Mon, 6 Oct 2008 23:03:03 -0700
 Subject: [PATCH] kbuild: AFTER_LINK
@@ -31,7 +31,7 @@ index b215c712d897..e18cd2a3ea53 100644
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
-index c3d7ccd25381..7c03993ea881 100644
+index 5bfe2243a08f..b6ec22f85266 100644
 --- a/arch/x86/entry/vdso/Makefile
 +++ b/arch/x86/entry/vdso/Makefile
 @@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \
diff --git a/0002-xen-netfront-detach-crash.patch b/0002-xen-netfront-detach-crash.patch
index 81838be..2cbd798 100644
--- a/0002-xen-netfront-detach-crash.patch
+++ b/0002-xen-netfront-detach-crash.patch
@@ -1,4 +1,4 @@
-From 702adf2c9c1536d5cb10b4be1340ba52654a05b5 Mon Sep 17 00:00:00 2001
+From 12e8f728cbc2bc04bb92b6507369462119aae167 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Thu, 6 Sep 2018 15:09:44 +0200
@@ -16,10 +16,10 @@ http://xen.markmail.org/thread/pw5edbtqienjx4q5
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index f17f602e6171..61298526aee3 100644
+index c914c24f880b..f1688897b256 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -1140,9 +1140,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
+@@ -1138,9 +1138,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
  
  		skb = queue->tx_skbs[i].skb;
  		get_page(queue->grant_tx_page[i]);
@@ -34,5 +34,5 @@ index f17f602e6171..61298526aee3 100644
  		queue->grant_tx_ref[i] = GRANT_INVALID_REF;
  		add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);
 -- 
-2.17.1
+2.20.1
 
diff --git a/0003-mce-hide-EBUSY-initialization-error-on-Xen.patch b/0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
index d1d52e3..f886e7a 100644
--- a/0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
+++ b/0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
@@ -1,4 +1,4 @@
-From 2d71f4d315dfcaaa9e4c1e3693e391f9d2b0a8b4 Mon Sep 17 00:00:00 2001
+From d067698d74ef4d62d6afffc5433cf8d2a6aa69e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Tue, 5 Jan 2016 02:44:04 +0100
@@ -35,14 +35,14 @@ from threshold_init_device explaining the situation:
 
 Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 ---
- arch/x86/kernel/cpu/mcheck/mce.c | 9 +++++++++
+ arch/x86/kernel/cpu/mce/core.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 953b3ce92dcc..e0bb9b52d8d1 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -52,6 +52,10 @@
+diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
+index 6ce290c506d9..8db95e580a85 100644
+--- a/arch/x86/kernel/cpu/mce/core.c
++++ b/arch/x86/kernel/cpu/mce/core.c
+@@ -50,6 +50,10 @@
  #include <asm/msr.h>
  #include <asm/reboot.h>
  
@@ -50,10 +50,10 @@ index 953b3ce92dcc..e0bb9b52d8d1 100644
 +#include <xen/xen.h>
 +#endif
 +
- #include "mce-internal.h"
+ #include "internal.h"
  
  static DEFINE_MUTEX(mce_log_mutex);
-@@ -2395,6 +2399,11 @@ static __init int mcheck_init_device(void)
+@@ -2406,6 +2410,11 @@ static __init int mcheck_init_device(void)
  	free_cpumask_var(mce_device_initialized);
  
  err_out:
@@ -66,5 +66,5 @@ index 953b3ce92dcc..e0bb9b52d8d1 100644
  
  	return err;
 -- 
-2.17.1
+2.20.1
 
diff --git a/0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch b/0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
index 356abaf..0ef3039 100644
--- a/0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
+++ b/0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
@@ -1,4 +1,4 @@
-From 84160fa4557bf07017e35180d53abe4ea6ef7b14 Mon Sep 17 00:00:00 2001
+From 6cc28f4d36c81f198dc8cdade583039642942dab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Sat, 30 Jan 2016 01:53:26 +0100
@@ -10,7 +10,7 @@ Ease debugging of PCI passthrough problems.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
-index e6c1934734b7..0458fcefa4b9 100644
+index 117e76b2f939..34f380be2b34 100644
 --- a/drivers/xen/events/events_base.c
 +++ b/drivers/xen/events/events_base.c
 @@ -521,7 +521,7 @@ static unsigned int __startup_pirq(unsigned int irq)
@@ -23,5 +23,5 @@ index e6c1934734b7..0458fcefa4b9 100644
  	}
  	evtchn = bind_pirq.port;
 -- 
-2.17.1
+2.20.1
 
diff --git a/0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch b/0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch
index c1b890e..f083dc0 100644
--- a/0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch
+++ b/0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch
@@ -1,4 +1,4 @@
-From 6bec01bac2a0b1b8d7639de2c7fd646363f57d2d Mon Sep 17 00:00:00 2001
+From ad4aeb98f9ebc13ebf9a81de5392ad8cd30c7525 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Mon, 11 Jun 2012 22:49:31 +0200
 Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
@@ -10,10 +10,10 @@ by normal user.
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 429d20131c7e..2541d8c38336 100644
+index 0ed4b200fa58..2054a3e9e435 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -2338,6 +2338,7 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2339,6 +2339,7 @@ static void blkfront_connect(struct blkfront_info *info)
  	unsigned int binfo;
  	char *envp[] = { "RESIZE=1", NULL };
  	int err, i;
@@ -21,7 +21,7 @@ index 429d20131c7e..2541d8c38336 100644
  
  	switch (info->connected) {
  	case BLKIF_STATE_CONNECTED:
-@@ -2405,6 +2406,12 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2406,6 +2407,12 @@ static void blkfront_connect(struct blkfront_info *info)
  		}
  	}
  
@@ -35,5 +35,5 @@ index 429d20131c7e..2541d8c38336 100644
  				  physical_sector_size);
  	if (err) {
 -- 
-2.17.1
+2.20.1
 
diff --git a/0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch b/0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
index 2e7982a..a1659a6 100644
--- a/0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
+++ b/0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
@@ -1,4 +1,4 @@
-From 6b4db8c77bd178701b3f501135ab3be08cdc43ac Mon Sep 17 00:00:00 2001
+From fea008c8237d8d1aa6ecf6e8bc16fbcf12da2b09 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Sun, 15 Jul 2012 19:57:47 +0200
 Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
@@ -8,7 +8,7 @@ Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 2541d8c38336..3f6df7d98265 100644
+index 2054a3e9e435..132723c0b337 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
 @@ -47,6 +47,7 @@
@@ -30,5 +30,5 @@ index 2541d8c38336..3f6df7d98265 100644
  	default:
  		/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
 -- 
-2.17.1
+2.20.1
 
diff --git a/0007-block-add-no_part_scan-module-parameter.patch b/0007-block-add-no_part_scan-module-parameter.patch
index dab7084..acf0119 100644
--- a/0007-block-add-no_part_scan-module-parameter.patch
+++ b/0007-block-add-no_part_scan-module-parameter.patch
@@ -1,4 +1,4 @@
-From a3d0a8585e975d169a3994463745620c8d8becd0 Mon Sep 17 00:00:00 2001
+From 7a37309da40875ffaab868473df535b2f19d6e7a Mon Sep 17 00:00:00 2001
 From: Rusty Bird <rustybird@openmailbox.org>
 Date: Mon, 11 Jul 2016 13:05:38 +0000
 Subject: [PATCH] block: add no_part_scan module parameter
@@ -15,10 +15,10 @@ the /sys/module/block/parameters/no_part_scan file.
  1 file changed, 12 insertions(+)
 
 diff --git a/block/genhd.c b/block/genhd.c
-index be5bab20b2ab..f4561f06e273 100644
+index 1dd8fd6613b8..3eeba80e40bf 100644
 --- a/block/genhd.c
 +++ b/block/genhd.c
-@@ -643,6 +643,15 @@ static void register_disk(struct device *parent, struct gendisk *disk)
+@@ -661,6 +661,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
  	WARN_ON(err);
  }
  
@@ -34,7 +34,7 @@ index be5bab20b2ab..f4561f06e273 100644
  /**
   * __device_add_disk - add disk information to kernel list
   * @parent: parent device for the disk
-@@ -660,6 +669,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
+@@ -680,6 +689,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
  	dev_t devt;
  	int retval;
  
@@ -45,5 +45,5 @@ index be5bab20b2ab..f4561f06e273 100644
  	 * be accompanied with EXT_DEVT flag.  Make sure all
  	 * parameters make sense.
 -- 
-2.17.1
+2.20.1
 
diff --git a/0008-xen-Add-RING_COPY_RESPONSE.patch b/0008-xen-Add-RING_COPY_RESPONSE.patch
index 5904853..144488c 100644
--- a/0008-xen-Add-RING_COPY_RESPONSE.patch
+++ b/0008-xen-Add-RING_COPY_RESPONSE.patch
@@ -1,4 +1,4 @@
-From bb7d9fa8c1c8d2e90ea7cac04fb1fafe4965ad69 Mon Sep 17 00:00:00 2001
+From d3ad2f3739a7c6eca8f7177a89449cbd16557c7f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Tue, 15 Dec 2015 21:35:14 +0100
@@ -54,5 +54,5 @@ index 3f40501fc60b..03702f6874df 100644
  #define RING_REQUEST_CONS_OVERFLOW(_r, _cons)				\
      (((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r))
 -- 
-2.17.1
+2.20.1
 
diff --git a/0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch b/0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
index 9737750..ded781b 100644
--- a/0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
+++ b/0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
@@ -1,4 +1,4 @@
-From 2d7190695574d4a39597a65d3ba3858098f22da4 Mon Sep 17 00:00:00 2001
+From 48468975242efd6098b66685a00e6f906fa740e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:09:55 +0100
@@ -18,10 +18,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 25 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 61298526aee3..08ea5004e86b 100644
+index f1688897b256..4d8d53862d1b 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -387,13 +387,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
+@@ -385,13 +385,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
  		rmb(); /* Ensure we see responses up to 'rp'. */
  
  		for (cons = queue->tx.rsp_cons; cons != prod; cons++) {
@@ -39,7 +39,7 @@ index 61298526aee3..08ea5004e86b 100644
  			skb = queue->tx_skbs[id].skb;
  			if (unlikely(gnttab_query_foreign_access(
  				queue->grant_tx_ref[id]) != 0)) {
-@@ -742,7 +742,7 @@ static int xennet_get_extras(struct netfront_queue *queue,
+@@ -740,7 +740,7 @@ static int xennet_get_extras(struct netfront_queue *queue,
  			     RING_IDX rp)
  
  {
@@ -48,7 +48,7 @@ index 61298526aee3..08ea5004e86b 100644
  	struct device *dev = &queue->info->netdev->dev;
  	RING_IDX cons = queue->rx.rsp_cons;
  	int err = 0;
-@@ -758,24 +758,23 @@ static int xennet_get_extras(struct netfront_queue *queue,
+@@ -756,24 +756,23 @@ static int xennet_get_extras(struct netfront_queue *queue,
  			break;
  		}
  
@@ -80,7 +80,7 @@ index 61298526aee3..08ea5004e86b 100644
  
  	queue->rx.rsp_cons = cons;
  	return err;
-@@ -785,28 +784,28 @@ static int xennet_get_responses(struct netfront_queue *queue,
+@@ -783,28 +782,28 @@ static int xennet_get_responses(struct netfront_queue *queue,
  				struct netfront_rx_info *rinfo, RING_IDX rp,
  				struct sk_buff_head *list)
  {
@@ -115,7 +115,7 @@ index 61298526aee3..08ea5004e86b 100644
  			xennet_move_rx_slot(queue, skb, ref);
  			err = -EINVAL;
  			goto next;
-@@ -820,7 +819,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
+@@ -818,7 +817,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
  		if (ref == GRANT_INVALID_REF) {
  			if (net_ratelimit())
  				dev_warn(dev, "Bad rx response id %d.\n",
@@ -124,7 +124,7 @@ index 61298526aee3..08ea5004e86b 100644
  			err = -EINVAL;
  			goto next;
  		}
-@@ -833,7 +832,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
+@@ -831,7 +830,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
  		__skb_queue_tail(list, skb);
  
  next:
@@ -133,7 +133,7 @@ index 61298526aee3..08ea5004e86b 100644
  			break;
  
  		if (cons + slots == rp) {
-@@ -843,7 +842,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
+@@ -841,7 +840,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
  			break;
  		}
  
@@ -142,7 +142,7 @@ index 61298526aee3..08ea5004e86b 100644
  		skb = xennet_get_rx_skb(queue, cons + slots);
  		ref = xennet_get_rx_ref(queue, cons + slots);
  		slots++;
-@@ -898,9 +897,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
+@@ -896,9 +895,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
  	struct sk_buff *nskb;
  
  	while ((nskb = __skb_dequeue(list))) {
@@ -154,7 +154,7 @@ index 61298526aee3..08ea5004e86b 100644
  
  		if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
  			unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;
-@@ -916,7 +915,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
+@@ -914,7 +913,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
  
  		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
  				skb_frag_page(nfrag),
@@ -163,7 +163,7 @@ index 61298526aee3..08ea5004e86b 100644
  
  		skb_shinfo(nskb)->nr_frags = 0;
  		kfree_skb(nskb);
-@@ -1012,7 +1011,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
+@@ -1010,7 +1009,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
  	i = queue->rx.rsp_cons;
  	work_done = 0;
  	while ((i != rp) && (work_done < budget)) {
@@ -173,5 +173,5 @@ index 61298526aee3..08ea5004e86b 100644
  
  		err = xennet_get_responses(queue, &rinfo, rp, &tmpq);
 -- 
-2.17.1
+2.20.1
 
diff --git a/0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch b/0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
index 3226ed9..9224e10 100644
--- a/0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
+++ b/0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
@@ -1,4 +1,4 @@
-From a72bc89ab6d6c7e171bd04357ea6954a9c62b43d Mon Sep 17 00:00:00 2001
+From 8ea03fbc0533da4a06b5b13a2ebff11c5e7e5db6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:19:37 +0100
@@ -20,10 +20,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 08ea5004e86b..88578e5aeaaf 100644
+index 4d8d53862d1b..834a7950bea1 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -458,7 +458,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
+@@ -456,7 +456,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
  	tx->flags = 0;
  
  	info->tx = tx;
@@ -32,7 +32,7 @@ index 08ea5004e86b..88578e5aeaaf 100644
  }
  
  static struct xen_netif_tx_request *xennet_make_first_txreq(
-@@ -575,7 +575,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
+@@ -573,7 +573,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
  	int slots;
  	struct page *page;
  	unsigned int offset;
@@ -41,7 +41,7 @@ index 08ea5004e86b..88578e5aeaaf 100644
  	unsigned long flags;
  	struct netfront_queue *queue = NULL;
  	unsigned int num_queues = dev->real_num_tx_queues;
-@@ -635,14 +635,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
+@@ -633,14 +633,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
  	}
  
  	/* First request for the linear area. */
@@ -60,5 +60,5 @@ index 08ea5004e86b..88578e5aeaaf 100644
  	if (skb->ip_summed == CHECKSUM_PARTIAL)
  		/* local packet? */
 -- 
-2.17.1
+2.20.1
 
diff --git a/0011-xen-netfront-add-range-check-for-Tx-response-id.patch b/0011-xen-netfront-add-range-check-for-Tx-response-id.patch
index a512214..d1cb100 100644
--- a/0011-xen-netfront-add-range-check-for-Tx-response-id.patch
+++ b/0011-xen-netfront-add-range-check-for-Tx-response-id.patch
@@ -1,4 +1,4 @@
-From 91bac2da855a018b8ffd1bed9694e9c962340f08 Mon Sep 17 00:00:00 2001
+From becb6fe42dc732b626000752a79e9374b6502417 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:22:24 +0100
@@ -19,10 +19,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 88578e5aeaaf..69e1c3aebe71 100644
+index 834a7950bea1..a429ab24114b 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -394,6 +394,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
+@@ -392,6 +392,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
  				continue;
  
  			id  = txrsp.id;
@@ -31,5 +31,5 @@ index 88578e5aeaaf..69e1c3aebe71 100644
  			if (unlikely(gnttab_query_foreign_access(
  				queue->grant_tx_ref[id]) != 0)) {
 -- 
-2.17.1
+2.20.1
 
diff --git a/0012-xen-blkfront-make-local-copy-of-response-before-usin.patch b/0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
index 42a8079..3640ca7 100644
--- a/0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
+++ b/0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
@@ -1,4 +1,4 @@
-From bfad51710e1523650c2cfbf9aff561bb8364d9a7 Mon Sep 17 00:00:00 2001
+From 137c43d513048974b8f2cf662b05f6b5b9b5711d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:51:10 +0100
@@ -20,7 +20,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 3f6df7d98265..e520bc6f6007 100644
+index 132723c0b337..a11d39df586b 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
 @@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,
@@ -124,5 +124,5 @@ index 3f6df7d98265..e520bc6f6007 100644
  			break;
  		default:
 -- 
-2.17.1
+2.20.1
 
diff --git a/0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch b/0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
index fbcff25..4a98e74 100644
--- a/0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
+++ b/0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
@@ -1,4 +1,4 @@
-From 98231d38e75826534ef10b0ea06ecde796b89c3c Mon Sep 17 00:00:00 2001
+From d611c137661200e874ce07633fd1f18232ad8ad2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 06:07:14 +0100
@@ -22,7 +22,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 44 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index e520bc6f6007..8132836e225b 100644
+index a11d39df586b..d55e18aa1cff 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
 @@ -527,19 +527,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
@@ -187,5 +187,5 @@ index e520bc6f6007..8132836e225b 100644
  	if (new_persistent_gnts)
  		gnttab_free_grant_references(setup.gref_head);
 -- 
-2.17.1
+2.20.1
 
diff --git a/0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch b/0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
index 2d24b50..a08279d 100644
--- a/0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
+++ b/0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
@@ -1,4 +1,4 @@
-From ca6107528e5b5c986b64297ae62f706b5b391b0c Mon Sep 17 00:00:00 2001
+From 5d1abeb05f35d53d7344eead0f8fcce4eea783fb Mon Sep 17 00:00:00 2001
 From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Date: Wed, 1 Apr 2015 17:01:26 -0400
 Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
@@ -71,5 +71,5 @@ index d9922ae36eb5..c8b674fd2455 100644
  	/* IN: Contains extra infor for this operation */
  	uint32_t info;
 -- 
-2.17.1
+2.20.1
 
diff --git a/0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch b/0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
index 9468186..fd9ec3c 100644
--- a/0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
+++ b/0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
@@ -1,4 +1,4 @@
-From 7cea4f1e3e43d8fc20e2605495d6ed24bfeeeb9b Mon Sep 17 00:00:00 2001
+From 38e59128707d1efda6ccba7e5ad548f5c2118926 Mon Sep 17 00:00:00 2001
 From: HW42 <hw42@ipsumj.de>
 Date: Tue, 12 Sep 2017 00:49:02 +0200
 Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes
@@ -82,10 +82,10 @@ index 73427d8e0116..a277ddc7f7b4 100644
  	return 0;
  }
 diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
-index 59661db144e5..51a116f37b95 100644
+index 097410a7cdb7..fb6a4a43c11d 100644
 --- a/drivers/xen/xen-pciback/pci_stub.c
 +++ b/drivers/xen/xen-pciback/pci_stub.c
-@@ -303,6 +303,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
+@@ -304,6 +304,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
  	xen_pcibk_config_reset_dev(dev);
  	xen_pcibk_config_free_dyn_fields(dev);
  
@@ -94,7 +94,7 @@ index 59661db144e5..51a116f37b95 100644
  	xen_unregister_device_domain_owner(dev);
  
  	spin_lock_irqsave(&found_psdev->lock, flags);
-@@ -1430,6 +1432,63 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf)
+@@ -1431,6 +1433,63 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf)
  }
  static DRIVER_ATTR_RW(permissive);
  
@@ -158,7 +158,7 @@ index 59661db144e5..51a116f37b95 100644
  static void pcistub_exit(void)
  {
  	driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_new_slot);
-@@ -1439,6 +1498,8 @@ static void pcistub_exit(void)
+@@ -1440,6 +1499,8 @@ static void pcistub_exit(void)
  	driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_quirks);
  	driver_remove_file(&xen_pcibk_pci_driver.driver,
  			   &driver_attr_permissive);
@@ -167,7 +167,7 @@ index 59661db144e5..51a116f37b95 100644
  	driver_remove_file(&xen_pcibk_pci_driver.driver,
  			   &driver_attr_irq_handlers);
  	driver_remove_file(&xen_pcibk_pci_driver.driver,
-@@ -1529,6 +1590,9 @@ static int __init pcistub_init(void)
+@@ -1530,6 +1591,9 @@ static int __init pcistub_init(void)
  	if (!err)
  		err = driver_create_file(&xen_pcibk_pci_driver.driver,
  					 &driver_attr_permissive);
@@ -190,5 +190,5 @@ index 263c059bff90..796f949c92be 100644
  	unsigned int enable_intx:1;
  	unsigned int isr_on:1; /* Whether the IRQ handler is installed. */
 -- 
-2.17.1
+2.20.1