summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-06-16 13:29:42 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-06-16 13:29:42 +0200
commit4fc7456f584e8bda87a5cf1fb631bf5343b815f5 (patch)
treece4bae6fee6db72fe48559cd98d3488f599cb283
parent103b43c2f754641fb5eb1ae61ddb016f7600fdf2 (diff)
parent149217b7b66e7f579e171075272c64538fab9ee9 (diff)
downloadkernel-4fc7456f584e8bda87a5cf1fb631bf5343b815f5.tar.gz
kernel-4fc7456f584e8bda87a5cf1fb631bf5343b815f5.tar.xz
kernel-4fc7456f584e8bda87a5cf1fb631bf5343b815f5.zip
merge origin
Diffstat
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec5
-rw-r--r--sources4
23 files changed, 26 insertions, 25 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 671f7d2cc..5f31e2e5e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2026,7 +2026,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 92d00159e..99a150463 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2018,7 +2018,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 5370a4340..7d4e150a0 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2048,7 +2048,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 d60792418..c13684cb3 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2041,7 +2041,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 6e0840639..85a6e9670 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2002,7 +2002,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 a88f17919..f47fc61be 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1995,7 +1995,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 08da3f6d0..1bbe70639 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1591,7 +1591,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 879b67a08..2d4c8e193 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1582,7 +1582,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 15d1450be..4d0bd2def 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1598,7 +1598,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 9a6a6c3c7..c423eb7c7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1589,7 +1589,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 e6cc479e1..6b3cd5dcb 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1721,7 +1721,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 2da419af4..1356bcdc4 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1712,7 +1712,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 43920aae9..a1bfcf045 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 5.18.4
%define patchversion 5.18
-%define pkgrelease 200
+%define pkgrelease 201
%define kversion 5
%define tarfile_release 5.18.4
# This is needed to do merge window version magic
@@ -3041,7 +3041,8 @@ fi
#
#
%changelog
-* Tue Jun 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.4-200]
+* Wed Jun 15 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.4-201]
+- Turn E1000 back on (Justin M. Forbes)
- Changelog update for rebase (Justin M. Forbes)
* Tue Jun 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.4-0]
diff --git a/sources b/sources
index 242879c1e..e7be0feb4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-5.18.4.tar.xz) = 7dc737b3860331e30dbcddfe8d403d02e00852aa3a70d194947f493035b64390140320f7e98e3148d11fd17535ca2a805209f3aa9eb41de4cbabb1f8f25c0cc3
-SHA512 (kernel-abi-stablelists-5.18.4-200.tar.bz2) = 0c8e90bbabf59936a8ca31a378915b480d17dbfe311db464e31a94b744766c6232d2cec47913f70303920b2649012867abd58c29d236b7dfdd2493db002b1130
-SHA512 (kernel-kabi-dw-5.18.4-200.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3
+SHA512 (kernel-abi-stablelists-5.18.4-201.tar.bz2) = c30d7a4076e4f7f75bbef749f0f2a9fa10e12e031b6cb158cf4c4f9602d3f9119e835bd5ffa21c5286684225d4aaf3c363c080693ce05af58fb952c9dff6eb1e
+SHA512 (kernel-kabi-dw-5.18.4-201.tar.bz2) = 5ae0e2b1d33b15ee51798ca965492d5113c1d6906f062424afe1c3aabc9ce784ebfa216a30d246e696cbed60e8358b2ad46dad0080c3eb9d70c3bcb9c0d1d2e3
generated by cgit (git 2.34.1) at 2024-04-19 22:14:24 +0000