diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index c6d0295d0..d46a55fde 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2025,7 +2025,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 995346621..2d8210014 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1536,7 +1536,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 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 10ea052c4..2f5be8903 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2017,7 +2017,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b2206a48c..609e2c886 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1528,7 +1528,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 diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 038bf5e04..92611a42b 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2047,7 +2047,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index ef21ab8bd..f7ec49df3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2040,7 +2040,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 21b47c58d..16c57f108 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2001,7 +2001,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ada726dc4..7cab079e3 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1994,7 +1994,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 4f7fd4a6b..5f283f131 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1590,7 +1590,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a486a584e..a41e9bf27 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1386,7 +1386,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 diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b85a4d718..82ee9afdc 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1581,7 +1581,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4e839540d..053cac4d0 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1378,7 +1378,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 diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ff3e8cb03..96c069867 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1597,7 +1597,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EADM_SCH=m CONFIG_EARLY_PRINTK_DBGP=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ad098ca6b..097d5b2ca 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1391,7 +1391,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 diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d9ddb44de..e90407042 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1588,7 +1588,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y CONFIG_E1000E=m -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E100=m CONFIG_EADM_SCH=m CONFIG_EARLY_PRINTK_DBGP=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 483cf415f..6e2f8d2e3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1383,7 +1383,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 diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c6c6023a2..8c3b5e673 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1388,7 +1388,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 diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index c1d21f807..659b2bd75 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1720,7 +1720,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=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index a105b1dac..ce6f50137 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_USB_XDBC=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b99c1c627..3f5e3318d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1711,7 +1711,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=m CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_USB_XDBC=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 1c44c7123..9b681dddd 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_USB_XDBC=y diff --git a/kernel.spec b/kernel.spec index 83c42ebc7..bd0da7300 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3034,7 +3034,9 @@ fi # # %changelog -* Tue Jun 14 2022 Justin M. Forbes [5.18.4-100] +* Wed Jun 15 2022 Justin M. Forbes [5.18.4-100] +- Turn E1000 back on correctly (Justin M. Forbes) +- Turn E1000 back on (Justin M. Forbes) - Changelog update for rebase (Justin M. Forbes) * Tue Jun 14 2022 Justin M. Forbes [5.18.4-0] diff --git a/sources b/sources index 569c6507f..380491cc1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.18.4.tar.xz) = 7dc737b3860331e30dbcddfe8d403d02e00852aa3a70d194947f493035b64390140320f7e98e3148d11fd17535ca2a805209f3aa9eb41de4cbabb1f8f25c0cc3 -SHA512 (kernel-abi-stablelists-5.18.4-100.tar.bz2) = 4d57a2e0ef91153b5975f08467da62693e33962317b279148870ff1ecbe00b288d6bfd9a26ad648acec00ab7f9da05e3f9add8c5fa712cee01de8e9b365b7ae6 +SHA512 (kernel-abi-stablelists-5.18.4-100.tar.bz2) = b640df487fd35779196a87868446e9db977e485fe239130535e82269e3cba5e0806190eaa1b215b2033bcb5764b75824560c191df657ce13950b56becde99bee SHA512 (kernel-kabi-dw-5.18.4-100.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3