diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-02 18:08:47 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-02 18:08:47 +0100 |
| commit | f59c617b3a30b74fa88d11e2a7728f6952dd7f53 (patch) | |
| tree | e8bf4a9eb92faa60cffd552fde10b14289e354ee | |
| parent | e7bf487b711b7430ce0f62882633de6d31bd9a08 (diff) | |
| parent | cd63899b7a71ca9762d4058168138cf01c5f78be (diff) | |
| download | kernel-f59c617b3a30b74fa88d11e2a7728f6952dd7f53.tar.gz kernel-f59c617b3a30b74fa88d11e2a7728f6952dd7f53.tar.xz kernel-f59c617b3a30b74fa88d11e2a7728f6952dd7f53.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/arm/CONFIG_FSL_XGMAC_MDIO | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug-fedora.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64-fedora.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-fedora.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
8 files changed, 10 insertions, 7 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_FSL_XGMAC_MDIO b/configs/fedora/generic/arm/CONFIG_FSL_XGMAC_MDIO index 9113f3294..9dde6c3cc 100644 --- a/configs/fedora/generic/arm/CONFIG_FSL_XGMAC_MDIO +++ b/configs/fedora/generic/arm/CONFIG_FSL_XGMAC_MDIO @@ -1 +1 @@ -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 11347beea..b98b293b8 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2118,7 +2118,7 @@ CONFIG_FSL_PQ_MDIO=m CONFIG_FSL_QDMA=m # CONFIG_FSL_QMAN_TEST is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index ab032abca..ee2b8a2ac 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2102,7 +2102,7 @@ CONFIG_FSL_PQ_MDIO=m CONFIG_FSL_QDMA=m # CONFIG_FSL_QMAN_TEST is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index aba044315..36118ff68 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2145,7 +2145,7 @@ CONFIG_FSL_DPAA2_ETH_DCB=y # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5963b9f5d..6f2e1e0aa 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2130,7 +2130,7 @@ CONFIG_FSL_DPAA2_ETH_DCB=y # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index e6b5ec8dd..41a652149 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2097,7 +2097,7 @@ CONFIG_FSL_DPAA2_ETH_DCB=y # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index c0e1dc44c..571ef0d17 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2082,7 +2082,7 @@ CONFIG_FSL_DPAA2_ETH_DCB=y # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FSL_RCPM=y -# CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_FSL_XGMAC_MDIO=m CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set diff --git a/kernel.spec b/kernel.spec index 8f48dbd5e..217cb33e9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2992,6 +2992,9 @@ fi # # %changelog +* Wed Dec 2 07:55:34 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.12-200 +- Linux v5.9.12 + * Tue Nov 24 11:22:38 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.11-200 - Linux v5.9.11 |