diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-12 12:18:10 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-12 12:18:10 +0100 |
| commit | fe91d7ccdd3ed9ae136047702273f7f0b24d6f56 (patch) | |
| tree | 8e552dea2d332e9982ef7473566af25611137bf5 | |
| parent | f2fefbb0538c357187ef3eeff7d9c068743bc132 (diff) | |
| parent | b724bdfa9ebe52b740b2d3ed665cceadc4435039 (diff) | |
| download | kernel-fe91d7ccdd3ed9ae136047702273f7f0b24d6f56.tar.gz kernel-fe91d7ccdd3ed9ae136047702273f7f0b24d6f56.tar.xz kernel-fe91d7ccdd3ed9ae136047702273f7f0b24d6f56.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | configs/fedora/generic/arm/CONFIG_SATA_SIL24 | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_ARM64_PMEM | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
| -rw-r--r-- | kernel-aarch64.config | 4 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 |
8 files changed, 9 insertions, 10 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_SATA_SIL24 b/configs/fedora/generic/arm/CONFIG_SATA_SIL24 deleted file mode 100644 index 7526a06a0..000000000 --- a/configs/fedora/generic/arm/CONFIG_SATA_SIL24 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SATA_SIL24 is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_PMEM b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_PMEM index 9325600d1..f2e1b130f 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_PMEM +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_PMEM @@ -1 +1 @@ -# CONFIG_ARM64_PMEM is not set +CONFIG_ARM64_PMEM=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 6f1bd2553..e2c0ad429 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -259,7 +259,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_PAN=y -# CONFIG_ARM64_PMEM is not set +CONFIG_ARM64_PMEM=y CONFIG_ARM64_PTDUMP_DEBUGFS=y CONFIG_ARM64_PTDUMP=y # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set @@ -4730,7 +4730,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3ae53df3a..f241c8b02 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -259,7 +259,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_PAN=y -# CONFIG_ARM64_PMEM is not set +CONFIG_ARM64_PMEM=y CONFIG_ARM64_PTDUMP_DEBUGFS=y # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set @@ -4707,7 +4707,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index add5455ef..06be2a125 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5075,7 +5075,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 3add6affa..62269a667 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4768,7 +4768,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index dd7f432a1..e3af01fce 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4745,7 +4745,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 288ca8434..105731a57 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5052,7 +5052,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set |