diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-21 07:25:33 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-21 07:25:33 +0100 |
commit | 2200e4f86707cbbbfac0d0fb2f7bb1822500b592 (patch) | |
tree | 8c5d7c88a5204d9f591a81d142d98431e229477c /configs | |
parent | 75f8db1318522e91b0ab3820bbce97fe1f0e8f63 (diff) | |
parent | f43033cacbc89eabe372a7606c493e99d7d99314 (diff) | |
download | kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.tar.gz kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.tar.xz kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc0.git6.1.vanilla.knurd.1.fc25
Diffstat (limited to 'configs')
-rw-r--r-- | configs/base-generic/CONFIG_GUP_BENCHMARK | 1 | ||||
-rw-r--r-- | configs/base-generic/CONFIG_HWSPINLOCK | 2 | ||||
-rw-r--r-- | configs/base-generic/CONFIG_NTB_SWITCHTEC | 1 | ||||
-rw-r--r-- | configs/base-generic/CONFIG_RPMSG_VIRTIO | 1 | ||||
-rw-r--r-- | configs/base-generic/CONFIG_SND_BCD2000 | 2 | ||||
-rw-r--r-- | configs/base-generic/CONFIG_TEST_FIND_BIT | 1 | ||||
-rw-r--r-- | configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX | 2 | ||||
-rw-r--r-- | configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM | 1 | ||||
-rw-r--r-- | configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI | 1 | ||||
-rw-r--r-- | configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT | 1 |
10 files changed, 10 insertions, 3 deletions
diff --git a/configs/base-generic/CONFIG_GUP_BENCHMARK b/configs/base-generic/CONFIG_GUP_BENCHMARK new file mode 100644 index 000000000..f978e4899 --- /dev/null +++ b/configs/base-generic/CONFIG_GUP_BENCHMARK @@ -0,0 +1 @@ +# CONFIG_GUP_BENCHMARK is not set diff --git a/configs/base-generic/CONFIG_HWSPINLOCK b/configs/base-generic/CONFIG_HWSPINLOCK index e35b793e2..6b531e93f 100644 --- a/configs/base-generic/CONFIG_HWSPINLOCK +++ b/configs/base-generic/CONFIG_HWSPINLOCK @@ -1 +1 @@ -CONFIG_HWSPINLOCK=m +CONFIG_HWSPINLOCK=y diff --git a/configs/base-generic/CONFIG_NTB_SWITCHTEC b/configs/base-generic/CONFIG_NTB_SWITCHTEC new file mode 100644 index 000000000..36258733e --- /dev/null +++ b/configs/base-generic/CONFIG_NTB_SWITCHTEC @@ -0,0 +1 @@ +CONFIG_NTB_SWITCHTEC=m diff --git a/configs/base-generic/CONFIG_RPMSG_VIRTIO b/configs/base-generic/CONFIG_RPMSG_VIRTIO new file mode 100644 index 000000000..78f0867f1 --- /dev/null +++ b/configs/base-generic/CONFIG_RPMSG_VIRTIO @@ -0,0 +1 @@ +CONFIG_RPMSG_VIRTIO=m diff --git a/configs/base-generic/CONFIG_SND_BCD2000 b/configs/base-generic/CONFIG_SND_BCD2000 index 0a60c490b..b56c9162f 100644 --- a/configs/base-generic/CONFIG_SND_BCD2000 +++ b/configs/base-generic/CONFIG_SND_BCD2000 @@ -1 +1 @@ -# CONFIG_SND_BCD2000 is not set +CONFIG_SND_BCD2000=m diff --git a/configs/base-generic/CONFIG_TEST_FIND_BIT b/configs/base-generic/CONFIG_TEST_FIND_BIT new file mode 100644 index 000000000..23788bfbd --- /dev/null +++ b/configs/base-generic/CONFIG_TEST_FIND_BIT @@ -0,0 +1 @@ +# CONFIG_TEST_FIND_BIT is not set diff --git a/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX index fd145f04f..47b9dbe8a 100644 --- a/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX +++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX @@ -1 +1 @@ -CONFIG_CRYPTO_DEV_NX=y +# CONFIG_CRYPTO_DEV_NX is not set diff --git a/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM new file mode 100644 index 000000000..2ba638248 --- /dev/null +++ b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_SMM @@ -0,0 +1 @@ +CONFIG_DELL_SMBIOS_SMM=m diff --git a/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI new file mode 100644 index 000000000..0e3f3d8de --- /dev/null +++ b/configs/base-generic/x86/CONFIG_DELL_SMBIOS_WMI @@ -0,0 +1 @@ +CONFIG_DELL_SMBIOS_WMI=m diff --git a/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT b/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT new file mode 100644 index 000000000..05356f742 --- /dev/null +++ b/configs/base-generic/x86/CONFIG_INTEL_WMI_THUNDERBOLT @@ -0,0 +1 @@ +CONFIG_INTEL_WMI_THUNDERBOLT=m |