diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-01 09:32:45 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-01 09:32:45 +0100 |
commit | 5a643e9eb5fe31f16ecf4a0808b3a53fc8bb4656 (patch) | |
tree | 580a7862fcc1434b2ca260d343f7c636aabf9766 | |
parent | c07f9c5f9c7fcf57b4052ba80ff2a891016745e8 (diff) | |
parent | 35a68a57f762a82447d6f1a53048b6eaacc996dc (diff) | |
download | kernel-5a643e9eb5fe31f16ecf4a0808b3a53fc8bb4656.tar.gz kernel-5a643e9eb5fe31f16ecf4a0808b3a53fc8bb4656.tar.xz kernel-5a643e9eb5fe31f16ecf4a0808b3a53fc8bb4656.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/CONFIG_BT_CMTP | 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-i686-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-s390x-fedora.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_BT_CMTP b/configs/fedora/generic/CONFIG_BT_CMTP index 6fe276815..fefe1adcd 100644 --- a/configs/fedora/generic/CONFIG_BT_CMTP +++ b/configs/fedora/generic/CONFIG_BT_CMTP @@ -1 +1 @@ -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f45f7e658..b28c4d6eb 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -735,7 +735,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0801c307c..915063847 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -735,7 +735,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 03e2930b9..5b2ac6845 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -735,7 +735,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8951f9530..c8fe3ce05 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -735,7 +735,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a57f65284..4afe4efcc 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -714,7 +714,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 4a39e6650..0665aa939 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -714,7 +714,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index bafefbfa7..75f4a48ab 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -576,7 +576,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 5597c42d0..793b76f2a 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -575,7 +575,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 0aa0d3885..48b5d63eb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -514,7 +514,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 169ad2807..fb47734a6 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -513,7 +513,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a91be5714..e8cd4394a 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -517,7 +517,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7d7021983..c96583de3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -516,7 +516,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 08c9efc9c..461179947 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -584,7 +584,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index bf9d058c1..a9feecbfb 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -583,7 +583,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_BREDR=y -CONFIG_BT_CMTP=m +# CONFIG_BT_CMTP is not set # CONFIG_BT_DEBUGFS is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m |