diff --git a/Makefile.rhelver b/Makefile.rhelver
index 6432181..6ed49c2 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 5
+RHEL_RELEASE = 6
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c517c7f..e4d4308 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2189,10 +2189,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6584,10 +6584,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index e8faf7f..5a28df0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1538,7 +1538,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
@@ -1723,11 +1723,11 @@ CONFIG_FC_APPID=y
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5287,10 +5287,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 40d5c38..0fe57a4 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2173,10 +2173,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6561,10 +6561,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c56d5ed..7c57d77 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1530,7 +1530,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
@@ -1707,11 +1707,11 @@ CONFIG_FC_APPID=y
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5266,10 +5266,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index f637858..b58d5b9 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2229,10 +2229,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6726,10 +6726,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 344a935..413e07d 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2214,10 +2214,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6704,10 +6704,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index df5c66c..c72932c 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2181,10 +2181,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6530,10 +6530,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 0cc2fa2..f97d5fa 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2166,10 +2166,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -6508,10 +6508,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 14ed4c5..fd255de 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1875,11 +1875,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5917,10 +5917,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 4889974..4122e3d 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1858,11 +1858,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5895,10 +5895,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 98b3b96..96190c1 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1741,11 +1741,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5586,10 +5586,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 69e49df..7971ed3 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1381,7 +1381,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
@@ -1560,12 +1560,12 @@ CONFIG_FC_APPID=y
 # CONFIG_FEALNX is not set
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5067,10 +5067,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 028a408..9fb574f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1724,11 +1724,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5563,10 +5563,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index eeada00..b24eac3 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1373,7 +1373,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y
@@ -1544,12 +1544,12 @@ CONFIG_FC_APPID=y
 # CONFIG_FEALNX is not set
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5050,10 +5050,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index ced205d..b0127a9 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1749,10 +1749,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5538,10 +5538,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 5d96f4f..700e814 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1384,7 +1384,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EADM_SCH=m
 CONFIG_EARLY_PRINTK_DBGP=y
@@ -1565,11 +1565,11 @@ CONFIG_FC_APPID=y
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5015,10 +5015,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0ed03ea..2663c88 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1732,10 +1732,10 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5515,10 +5515,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 2b452f2..33a09ed 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1376,7 +1376,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EADM_SCH=m
 CONFIG_EARLY_PRINTK_DBGP=y
@@ -1549,11 +1549,11 @@ CONFIG_FC_APPID=y
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -4998,10 +4998,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 9d4f2a6..cee87a6 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1385,7 +1385,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 # CONFIG_EADM_SCH is not set
 CONFIG_EARLY_PRINTK_DBGP=y
@@ -1559,11 +1559,11 @@ CONFIG_FC_APPID=y
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5026,10 +5026,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index db52d19..9c21838 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1917,11 +1917,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5967,10 +5967,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 1fd03ba..779b9b6 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1468,7 +1468,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_EFI=y
@@ -1675,12 +1675,12 @@ CONFIG_FCOE_FNIC=m
 # CONFIG_FEALNX is not set
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5253,10 +5253,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 2a51f6e..ebad9ed 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1900,11 +1900,11 @@ CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
@@ -5945,10 +5945,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 753b9be..638d481 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1460,7 +1460,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_E1000E_HWTS=y
 CONFIG_E1000E=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
 # CONFIG_E100 is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_EFI=y
@@ -1659,12 +1659,12 @@ CONFIG_FCOE_FNIC=m
 # CONFIG_FEALNX is not set
 CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NET is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_FIREWIRE_OHCI is not set
+# CONFIG_FIREWIRE_SBP2 is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5233,10 +5233,10 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
+# CONFIG_SND_FIREWIRE_DIGI00X is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREWIRE_TASCAM is not set
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel.spec b/kernel.spec
index 9d5a2ec..e24d940 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 5
+%global distro_build 6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 5.el9
+%define pkgrelease 6.el9
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 5%{?buildid}%{?dist}
+%define specrelease 6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -671,7 +671,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.0-5.el9.tar.xz
+Source0: linux-5.14.0-6.el9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1350,8 +1350,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.0-5.el9 -c
-mv linux-5.14.0-5.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-6.el9 -c
+mv linux-5.14.0-6.el9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -1623,15 +1623,8 @@ BuildKernel() {
     fi
 
     %ifarch x86_64 aarch64
-    if [ -x /usr/bin/rpm-sign ]; then
-        %define _rhel 9
-        %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
-        %undefine _rhel
-    else
-        %pesign -s -i $SignImage -o vmlinuz.signed
-    fi
+    %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
     %endif
-
     %ifarch s390x ppc64le
     if [ -x /usr/bin/rpm-sign ]; then
 	rpm-sign --key "%{pesign_name_0}" --lkmsign $SignImage --output vmlinuz.signed
@@ -2949,6 +2942,21 @@ fi
 #
 #
 %changelog
+* Fri Oct 08 2021 Herton R. Krzesinski <herton@redhat.com> [5.14.0-6.el9]
+- pinctrl: Bulk conversion to generic_handle_domain_irq() (David Arcari) [2000232]
+- pinctrl: amd: Handle wake-up interrupt (David Arcari) [2000232]
+- pinctrl: amd: Add irq field data (David Arcari) [2000232]
+- Revert "redhat: define _rhel variable because pesign macro now needs it" (Jan Stancek)
+- redhat: switch secureboot kernel image signing to release keys (Jan Stancek)
+- redhat/configs: Disable FIREWIRE (Prarit Bhargava) [1871862]
+- Enable e1000 in rhel9 as unsupported (Ken Cox) [2002344]
+
+* Mon Oct 04 2021 Jan Stancek <jstancek@redhat.com> [5.14.0-1.6.1.el9]
+- Revert "redhat: define _rhel variable because pesign macro now needs it" (Jan Stancek)
+- redhat: switch secureboot kernel image signing to release keys (Jan Stancek)
+- redhat/configs: Disable FIREWIRE (Prarit Bhargava) [1871862]
+- Enable e1000 in rhel9 as unsupported (Ken Cox) [2002344]
+
 * Thu Sep 30 2021 Herton R. Krzesinski <herton@redhat.com> [5.14.0-5.el9]
 - redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953]
 - fs: dlm: fix return -EINTR on recovery stopped (Alexander Aring) [2004213]
diff --git a/sources b/sources
index 8c97d77..2bcf7d9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-5.el9.tar.xz) = b46c10da644b7ba178bd3a9170b269b54f07a02714b8122fbc64062c4f8bc4357babb6ba332acf636628d90e45e06ead5ede93bf0b65622c6b37e78c4a3cccba
-SHA512 (kernel-abi-stablelists-5.14.0-5.tar.bz2) = fa79fb864468573e328de8051be6b2f4311183e7c297f6b4470f7842f9cc12dcd77711016dc946e9bf3675ce98a1adaaa169491782faee90e672466220862e53
-SHA512 (kernel-kabi-dw-5.14.0-5.tar.bz2) = dcdc38306e55d242b798924dd00460fc80483e2fd64861236f801671ba8281e7cabf7bdf7a8ae4272aa7ac37c391859f2145fb62265f5476a80a15be03df01e3
+SHA512 (linux-5.14.0-6.el9.tar.xz) = 08ea0818ec93c9fb10eeed899fc84aee26d2ff4108906fad46e6024a0dd6c5d8aade0e98b891510d7d806f37b2f500edd794cf532879a8f6b65d4bacba9fa2b9
+SHA512 (kernel-abi-stablelists-5.14.0-6.tar.bz2) = 13f84842276a349b226f1fe8f0c217be6f321cbfd8ab6c348f9dc5d7bf2dde123787416966a953814cd7b136817a7c4362eda172e549383a381c3c42cd6b8a56
+SHA512 (kernel-kabi-dw-5.14.0-6.tar.bz2) = 0995d280b425227627e13450c58252b3cda7c3da234557d00aadf3aaa896b07d51f5f61422950b3e0413ae151d7b4fbc6b53c7ce2368098c610042a57323181d