Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-11-01 13:51:09 +0100
committerMichal Marek <mmarek@suse.cz>2013-11-01 13:51:09 +0100
commit2417eb9dbf01c23f0991b3bfd6cec1255fc098d6 (patch)
treee7e12f40d40ece47a2f80c7fefe261970116149d
parentf0a52f07b2e3db7d7ce3983f9ffc06583ec522f3 (diff)
Revert aer_recover_queue() __GENKSYMS__ hack, add a fake symset with the
previous value instead (bnc#847721)
-rw-r--r--kabi/i386/symsets-default.tar.gzbin244358 -> 244876 bytes
-rw-r--r--kabi/i386/symsets-pae.tar.gzbin241587 -> 241867 bytes
-rw-r--r--kabi/i386/symsets-trace.tar.gzbin242680 -> 242910 bytes
-rw-r--r--kabi/i386/symtypes-default4
-rw-r--r--kabi/i386/symtypes-pae4
-rw-r--r--kabi/i386/symtypes-trace4
-rw-r--r--kabi/i386/symvers-default2
-rw-r--r--kabi/i386/symvers-default.fake1
-rw-r--r--kabi/i386/symvers-pae2
-rw-r--r--kabi/i386/symvers-pae.fake1
-rw-r--r--kabi/i386/symvers-trace2
-rw-r--r--kabi/i386/symvers-trace.fake1
-rw-r--r--kabi/x86_64/symsets-default.tar.gzbin241943 -> 243106 bytes
-rw-r--r--kabi/x86_64/symsets-trace.tar.gzbin243796 -> 243810 bytes
-rw-r--r--kabi/x86_64/symsets-xen.tar.gzbin237184 -> 237442 bytes
-rw-r--r--kabi/x86_64/symtypes-default4
-rw-r--r--kabi/x86_64/symtypes-trace4
-rw-r--r--kabi/x86_64/symtypes-xen4
-rw-r--r--kabi/x86_64/symvers-default2
-rw-r--r--kabi/x86_64/symvers-default.fake1
-rw-r--r--kabi/x86_64/symvers-trace2
-rw-r--r--kabi/x86_64/symvers-trace.fake1
-rw-r--r--kabi/x86_64/symvers-xen2
-rw-r--r--kabi/x86_64/symvers-xen.fake1
-rw-r--r--patches.kabi/0001-kabi-Hide-change-in-aer_recover_queue-from-genksyms.patch54
-rw-r--r--series.conf1
26 files changed, 30 insertions, 67 deletions
diff --git a/kabi/i386/symsets-default.tar.gz b/kabi/i386/symsets-default.tar.gz
index 84c5761d11..409df6c881 100644
--- a/kabi/i386/symsets-default.tar.gz
+++ b/kabi/i386/symsets-default.tar.gz
Binary files differ
diff --git a/kabi/i386/symsets-pae.tar.gz b/kabi/i386/symsets-pae.tar.gz
index 0f03b4d6a1..09a265ee6a 100644
--- a/kabi/i386/symsets-pae.tar.gz
+++ b/kabi/i386/symsets-pae.tar.gz
Binary files differ
diff --git a/kabi/i386/symsets-trace.tar.gz b/kabi/i386/symsets-trace.tar.gz
index 3f51eb73ba..0a5a67e51f 100644
--- a/kabi/i386/symsets-trace.tar.gz
+++ b/kabi/i386/symsets-trace.tar.gz
Binary files differ
diff --git a/kabi/i386/symtypes-default b/kabi/i386/symtypes-default
index a3c58eaef0..6b9aa0e417 100644
--- a/kabi/i386/symtypes-default
+++ b/kabi/i386/symtypes-default
@@ -54315,7 +54315,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/i386/symtypes-pae b/kabi/i386/symtypes-pae
index 2590515197..feaa370581 100644
--- a/kabi/i386/symtypes-pae
+++ b/kabi/i386/symtypes-pae
@@ -54683,7 +54683,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/i386/symtypes-trace b/kabi/i386/symtypes-trace
index f6cb2ca28f..4bbb99c621 100644
--- a/kabi/i386/symtypes-trace
+++ b/kabi/i386/symtypes-trace
@@ -55687,7 +55687,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/i386/symvers-default b/kabi/i386/symvers-default
index 2d5650d6f9..641e25cc3e 100644
--- a/kabi/i386/symvers-default
+++ b/kabi/i386/symvers-default
@@ -300,7 +300,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0x3588dc31 kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0xb0797773 pcim_iounmap vmlinux EXPORT_SYMBOL
0x4242b9cf kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0x20b69cb7 mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/i386/symvers-default.fake b/kabi/i386/symvers-default.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/i386/symvers-default.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/i386/symvers-pae b/kabi/i386/symvers-pae
index 7069b69a60..8d9269deae 100644
--- a/kabi/i386/symvers-pae
+++ b/kabi/i386/symvers-pae
@@ -293,7 +293,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0x302a790b kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0x5b909364 pcim_iounmap vmlinux EXPORT_SYMBOL
0x4242b9cf kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0x20b69cb7 mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/i386/symvers-pae.fake b/kabi/i386/symvers-pae.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/i386/symvers-pae.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/i386/symvers-trace b/kabi/i386/symvers-trace
index 31475635c7..b1c8729aec 100644
--- a/kabi/i386/symvers-trace
+++ b/kabi/i386/symvers-trace
@@ -293,7 +293,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0x33e62eda kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0x48bee80d pcim_iounmap vmlinux EXPORT_SYMBOL
0x4242b9cf kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0x20b69cb7 mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/i386/symvers-trace.fake b/kabi/i386/symvers-trace.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/i386/symvers-trace.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symsets-default.tar.gz b/kabi/x86_64/symsets-default.tar.gz
index 9c7c7c9c27..5b791a5d04 100644
--- a/kabi/x86_64/symsets-default.tar.gz
+++ b/kabi/x86_64/symsets-default.tar.gz
Binary files differ
diff --git a/kabi/x86_64/symsets-trace.tar.gz b/kabi/x86_64/symsets-trace.tar.gz
index 3025af9a84..bde07ca407 100644
--- a/kabi/x86_64/symsets-trace.tar.gz
+++ b/kabi/x86_64/symsets-trace.tar.gz
Binary files differ
diff --git a/kabi/x86_64/symsets-xen.tar.gz b/kabi/x86_64/symsets-xen.tar.gz
index 51bef38128..3c3b3f8fd5 100644
--- a/kabi/x86_64/symsets-xen.tar.gz
+++ b/kabi/x86_64/symsets-xen.tar.gz
Binary files differ
diff --git a/kabi/x86_64/symtypes-default b/kabi/x86_64/symtypes-default
index 4384851044..add03faf60 100644
--- a/kabi/x86_64/symtypes-default
+++ b/kabi/x86_64/symtypes-default
@@ -56629,7 +56629,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/x86_64/symtypes-trace b/kabi/x86_64/symtypes-trace
index cb20c9bd67..80aef95a8b 100644
--- a/kabi/x86_64/symtypes-trace
+++ b/kabi/x86_64/symtypes-trace
@@ -57749,7 +57749,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/x86_64/symtypes-xen b/kabi/x86_64/symtypes-xen
index 25cd331b89..e6520871d4 100644
--- a/kabi/x86_64/symtypes-xen
+++ b/kabi/x86_64/symtypes-xen
@@ -56005,7 +56005,9 @@ s##pci_ats
pci_enable_pcie_error_reporting extern int pci_enable_pcie_error_reporting ( s#pci_dev * )
pci_disable_pcie_error_reporting extern int pci_disable_pcie_error_reporting ( s#pci_dev * )
pci_cleanup_aer_uncorrect_error_status extern int pci_cleanup_aer_uncorrect_error_status ( s#pci_dev * )
-aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int )
+s#aer_header_log_regs struct aer_header_log_regs { unsigned int dw0 ; unsigned int dw1 ; unsigned int dw2 ; unsigned int dw3 ; }
+s#aer_capability_regs struct aer_capability_regs { t#u32 header ; t#u32 uncor_status ; t#u32 uncor_mask ; t#u32 uncor_severity ; t#u32 cor_status ; t#u32 cor_mask ; t#u32 cap_control ; s#aer_header_log_regs header_log ; t#u32 root_command ; t#u32 root_status ; t#u16 cor_err_source ; t#u16 uncor_err_source ; }
+aer_recover_queue extern void aer_recover_queue ( int , unsigned int , unsigned int , int , s#aer_capability_regs * )
/* drivers/pci/pcie/aer/aerdrv_errprint.o */
cper_severity_to_aer extern int cper_severity_to_aer ( int )
diff --git a/kabi/x86_64/symvers-default b/kabi/x86_64/symvers-default
index 77a53aa47a..10e3e6f9dd 100644
--- a/kabi/x86_64/symvers-default
+++ b/kabi/x86_64/symvers-default
@@ -293,7 +293,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0xf00d218b kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0x8ea4c330 pcim_iounmap vmlinux EXPORT_SYMBOL
0x93a9f94d kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0xbc87125c mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symvers-default.fake b/kabi/x86_64/symvers-default.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/x86_64/symvers-default.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symvers-trace b/kabi/x86_64/symvers-trace
index a3ca782009..8db89ea791 100644
--- a/kabi/x86_64/symvers-trace
+++ b/kabi/x86_64/symvers-trace
@@ -293,7 +293,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0x60f58165 kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0xabac232e pcim_iounmap vmlinux EXPORT_SYMBOL
0x93a9f94d kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0xbc87125c mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symvers-trace.fake b/kabi/x86_64/symvers-trace.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/x86_64/symvers-trace.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symvers-xen b/kabi/x86_64/symvers-xen
index b4dee729ec..d8972dfe19 100644
--- a/kabi/x86_64/symvers-xen
+++ b/kabi/x86_64/symvers-xen
@@ -292,7 +292,7 @@
0x71e8d5ba capilib_data_b3_req drivers/isdn/capi/kernelcapi EXPORT_SYMBOL
0x765920f3 kernel_accept vmlinux EXPORT_SYMBOL
0xfcac0d40 acpi_install_interface_handler vmlinux EXPORT_SYMBOL
-0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
+0x585704ab aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
0xe1455f48 pcim_iounmap vmlinux EXPORT_SYMBOL
0x1cf3d453 kset_create_and_add vmlinux EXPORT_SYMBOL_GPL
0x8faff0cf mm_kobj vmlinux EXPORT_SYMBOL_GPL
diff --git a/kabi/x86_64/symvers-xen.fake b/kabi/x86_64/symvers-xen.fake
new file mode 100644
index 0000000000..3da9d459ca
--- /dev/null
+++ b/kabi/x86_64/symvers-xen.fake
@@ -0,0 +1 @@
+0xcc3da32d aer_recover_queue vmlinux EXPORT_SYMBOL_GPL
diff --git a/patches.kabi/0001-kabi-Hide-change-in-aer_recover_queue-from-genksyms.patch b/patches.kabi/0001-kabi-Hide-change-in-aer_recover_queue-from-genksyms.patch
deleted file mode 100644
index 587acddd53..0000000000
--- a/patches.kabi/0001-kabi-Hide-change-in-aer_recover_queue-from-genksyms.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e67796123c32897fd67c814508caa87497265e60 Mon Sep 17 00:00:00 2001
-From: Michal Marek <mmarek@suse.cz>
-Date: Tue, 29 Oct 2013 11:58:33 +0100
-Subject: [PATCH] kabi: Hide change in aer_recover_queue() from genksyms
-Patch-mainline: never (kabi)
-References: bnc#847721
-
-The aer_recover_queue() symbol is only going to be used by ghes.ko, but
-it is part of the drivers_pci_pcie_aer_aerdriver symset, which some KMPs
-depend on.
-
-Signed-off-by: Michal Marek <mmarek@suse.cz>
----
- drivers/pci/pcie/aer/aerdrv_core.c | 6 +++++-
- include/linux/aer.h | 7 +++++--
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
-index 5a3cadd..c56694c 100644
---- a/drivers/pci/pcie/aer/aerdrv_core.c
-+++ b/drivers/pci/pcie/aer/aerdrv_core.c
-@@ -602,7 +602,11 @@ static DEFINE_SPINLOCK(aer_recover_ring_lock);
- static DECLARE_WORK(aer_recover_work, aer_recover_work_func);
-
- void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-- int severity, struct aer_capability_regs *aer_regs)
-+ int severity
-+#ifndef __GENKSYMS__
-+ , struct aer_capability_regs *aer_regs
-+#endif
-+ )
- {
- unsigned long flags;
- struct aer_recover_entry entry = {
-diff --git a/include/linux/aer.h b/include/linux/aer.h
-index 3c3718e..52202d9 100644
---- a/include/linux/aer.h
-+++ b/include/linux/aer.h
-@@ -57,7 +57,10 @@ extern void cper_print_aer(struct pci_dev *dev,
- int cper_severity, struct aer_capability_regs *aer);
- extern int cper_severity_to_aer(int cper_severity);
- extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-- int severity,
-- struct aer_capability_regs *aer_regs);
-+ int severity
-+#ifndef __GENKSYMS__
-+ , struct aer_capability_regs *aer_regs
-+#endif
-+ );
- #endif //_AER_H_
-
---
-1.8.1.4
-
diff --git a/series.conf b/series.conf
index 5b03fc84ad..476b87abd8 100644
--- a/series.conf
+++ b/series.conf
@@ -15097,7 +15097,6 @@
patches.drivers/pci_aer_cleanup_log_output.patch
patches.fixes/aer_recover_queue_misses_pci_dev_put.patch
patches.fixes/acpi_apei_move_cper_print_aer_out_of_irq_context.patch
- patches.kabi/0001-kabi-Hide-change-in-aer_recover_queue-from-genksyms.patch
patches.fixes/pci_aer_also_reset_root_port_links.patch
patches.fixes/pci_aer_do_not_parse_hest_on_non_pci_devices.patch
patches.fixes/pci_aer_factor_out_hest_device_type_matching.patch