diff --git a/README.md b/README.md
index 67b341a..4f3f0ea 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,15 @@ Installation
 ------------
 To install from source please run ``make`` and ``sudo make install`` from the top level.
 
+RPM Build
+---------
+Run:
+```
+$ export exanic_version=2.7.4
+$ (cd .. && tar -czf $HOME/rpmbuild/SOURCES/exanic-${exanic_version}.tar.gz exanic-software --transform=s#exanic-software/#exanic-${exanic_version}/#g)
+$ rpmbuild -ba -D 'debug_package %{nil}' exanic.spec
+```
+
 Support
 -------
 Complete documentation is available from our [website](https://www.cisco.com/c/en/us/td/docs/dcn/nexus3550/smartnic/sw/user-guide/cisco-nexus-smartnic-user-guide/index.html). For other questions and comments, you can contact Cisco TAC support team.
diff --git a/exanic.spec b/exanic.spec
index e1a7644..f711a33 100644
--- a/exanic.spec
+++ b/exanic.spec
@@ -1,6 +1,6 @@
 Name:           exanic
-Version:        2.7.2-git
-Release:        1%{?dist}
+Version:        2.7.4
+Release:        2%{?dist}
 
 Summary:        ExaNIC drivers and software
 Group:          System Environment/Kernel
diff --git a/modules/exanic/exanic-main.c b/modules/exanic/exanic-main.c
index a5312f2..43e4d6a 100644
--- a/modules/exanic/exanic-main.c
+++ b/modules/exanic/exanic-main.c
@@ -18,9 +18,6 @@
 #include <linux/pci-aspm.h>
 #endif
 #include <linux/interrupt.h>
-#if defined(CONFIG_PCIEAER)
-#include <linux/aer.h>
-#endif
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/if_arp.h>
@@ -1058,9 +1055,6 @@ static int exanic_probe(struct pci_dev *pdev,
         goto err_req_regions;
     }
 
-#if defined(CONFIG_PCIEAER)
-    pci_enable_pcie_error_reporting(pdev);
-#endif
     pci_set_master(pdev);
     pci_set_drvdata(pdev, exanic);
     exanic->pci_dev = pdev;
@@ -1883,9 +1877,6 @@ static int exanic_probe(struct pci_dev *pdev,
 err_regs_ioremap:
 err_regs_size:
 err_regs_bar_type:
-#if defined(CONFIG_PCIEAER)
-    pci_disable_pcie_error_reporting(pdev);
-#endif
     pci_release_regions(pdev);
 err_req_regions:
     pci_disable_device(pdev);
@@ -2002,9 +1993,6 @@ static void exanic_remove(struct pci_dev *pdev)
     if (exanic->regs_virt != NULL)
         iounmap(exanic->regs_virt);
 
-#if defined(CONFIG_PCIEAER)
-    pci_disable_pcie_error_reporting(pdev);
-#endif
     pci_release_regions(pdev);
     pci_disable_device(pdev);
 }
diff --git a/modules/exanic/exanic-netdev.c b/modules/exanic/exanic-netdev.c
index c9cdf0f..e35484a 100644
--- a/modules/exanic/exanic-netdev.c
+++ b/modules/exanic/exanic-netdev.c
@@ -1888,7 +1888,7 @@ static int exanic_netdev_poll(struct napi_struct *napi, int budget)
         if (exanic_rx_ready(rx))
         {
             /* Poll again as soon as possible */
-            napi_reschedule(napi);
+            napi_schedule(napi);
         }
         else if (priv->rx_coalesce_timeout_ns > 0)
         {
diff --git a/modules/exasock/exasock-bonding-sysfs.c b/modules/exasock/exasock-bonding-sysfs.c
index 685a0d6..3b33f2b 100644
--- a/modules/exasock/exasock-bonding-sysfs.c
+++ b/modules/exasock/exasock-bonding-sysfs.c
@@ -29,9 +29,9 @@ exabond_get_sysfs_namespace(struct class *cls,
 #endif
 
 static ssize_t
-exabond_masters_show(struct class *c,
+exabond_masters_show(const struct class *c,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
-                     struct class_attribute *cattr,
+                     const struct class_attribute *cattr,
 #endif
                      char *buf)
 {
@@ -71,9 +71,9 @@ exabond_masters_show(struct class *c,
 }
 
 static ssize_t
-exabond_masters_store(struct class *c,
+exabond_masters_store(const struct class *c,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
-                      struct class_attribute *cattr,
+                      const struct class_attribute *cattr,
 #endif
                       const char *buf, size_t count)
 {