Changes in Kconfig

4b4193256c8d3bc3a5397b5cd9494c2ad386317d - Merge branch 'next' into for-linus

Tue, 15 Dec 2020 01:27:23 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.11 merge window. List of files: /linux/drivers/w1/Kconfig

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 03:13:23 +0100

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/drivers/w1/Kconfig

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/drivers/w1/Kconfig

3b5d1afd1f13bcab85eaa28223ad396694f929e3 - Merge branch 'for-next' into for-linus

Mon, 03 Aug 2020 08:10:08 +0200

Merge branch 'for-next' into for-linus List of files: /linux/drivers/w1/Kconfig

98817a84ff1c755c347ac633ff017a623a631fad - Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Tue, 30 Jun 2020 12:07:51 +0200

Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - Fix atomicity of affinity update in the GIC driver - Don't sleep in atomic when waiting for a GICv4.1 RD to respond - Fix a couple of typos in user-visible messages List of files: /linux/drivers/w1/Kconfig

77346a704c913268a2dad68d59523fd85dc74088 - Merge tag 'v5.8-rc3' into arm/qcom

Tue, 30 Jun 2020 11:32:02 +0200

Merge tag 'v5.8-rc3' into arm/qcomLinux 5.8-rc3 List of files: /linux/drivers/w1/Kconfig

60e9eabf41fa916d2ef68c5bf929197975917578 - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 29 Jun 2020 12:15:51 +0200

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextSome conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/w1/Kconfig

0f69403d2535ffc7200a8414cf3ca66a49b0d741 - Merge drm/drm-next into drm-intel-next-queued

Thu, 25 Jun 2020 17:05:03 +0200

Merge drm/drm-next into drm-intel-next-queuedCatch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap lockingAPI: convert mmap_sem comments").Signed-off-by: Jani Nikula List of files: /linux/drivers/w1/Kconfig

08a7c7772b4db0be06e3b27239147c0a36e2a507 - Merge remote-tracking branch 'torvalds/master' into perf/urgent

Wed, 17 Jun 2020 18:20:14 +0200

Merge remote-tracking branch 'torvalds/master' into perf/urgentTo get some newer headers that got out of sync with the copies in tools/so that we can try to have the tools/perf/ build clean for v5.8 withfewer pull requests.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/w1/Kconfig

6870112c46c867f50cd27570860a05bd82614b5c - Merge tag 'v5.8-rc1' into regulator-5.8

Wed, 17 Jun 2020 13:39:12 +0200

Merge tag 'v5.8-rc1' into regulator-5.8Linux 5.8-rc1 List of files: /linux/drivers/w1/Kconfig

07c7b547a79605f1041d55b84d91a4a4d9c5b363 - Merge tag 'v5.8-rc1' into fixes

Tue, 16 Jun 2020 18:25:03 +0200

Merge tag 'v5.8-rc1' into fixesLinux 5.8-rc1 List of files: /linux/drivers/w1/Kconfig

4b3c1f1b15f576445c221cbc77a88540433a2ba7 - Merge v5.8-rc1 into drm-misc-fixes

Tue, 16 Jun 2020 13:31:47 +0200

Merge v5.8-rc1 into drm-misc-fixesBeginning a new release cycles for what will become v5.8. Updatingdrm-misc-fixes accordingly.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/w1/Kconfig

6adc19fd13f11883c44df67b551cf8201e6bba1d - Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Sat, 13 Jun 2020 22:29:16 +0200

Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help'* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues List of files: /linux/drivers/w1/Kconfig

a7f7f6248d9740d710fd6bd190293fe5e16410ac - treewide: replace '---help---' in Kconfig files with 'help'

Sat, 13 Jun 2020 18:50:22 +0200

treewide: replace '---help---' in Kconfig files with 'help'Since commit 84af7a6194e4 ("checkpatch: kconfig: prefer 'help' over'---help---'"), the number of '---help---' has been graduallydecreasing, but there are still more than 2400 instances.This commit finishes the conversion. While I touched the lines,I also fixed the indentation.There are a variety of indentation styles found. a) 4 spaces + '---help---' b) 7 spaces + '---help---' c) 8 spaces + '---help---' d) 1 space + 1 tab + '---help---' e) 1 tab + '---help---' (correct indentation) f) 1 tab + 1 space + '---help---' g) 1 tab + 2 spaces + '---help---'In order to convert all of them to 1 tab + 'help', I ran thefollowing commend: $ find . -name 'Kconfig*' | xargs sed -i 's/^[[:space:]]*---help---/\thelp/'Signed-off-by: Masahiro Yamada List of files: /linux/drivers/w1/Kconfig

0898782247ae533d1f4e47a06bc5d4870931b284 - Merge branch 'next' into for-linus

Mon, 16 Sep 2019 18:56:27 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.4 merge window. List of files: /linux/drivers/w1/Kconfig

d3f9990f1b48514b33342612b51fad238592d774 - Merge branch 'for-next' into for-linus

Sat, 14 Sep 2019 17:24:57 +0200

Merge branch 'for-next' into for-linusSigned-off-by: Takashi Iwai List of files: /linux/drivers/w1/Kconfig

6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 - Merge branch 'master' into for-5.4/logitech

Fri, 23 Aug 2019 11:35:39 +0200

Merge branch 'master' into for-5.4/logitechSigned-off-by: Benjamin Tissoires List of files: /linux/drivers/w1/Kconfig

75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 23 Aug 2019 06:08:04 +0200

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in fixes for the XIVE interrupt controller which touch bothgeneric powerpc and PPC KVM code. To avoid merge conflicts, thesecommits will go upstream via the powerpc tree as well as the KVM tree.Signed-off-by: Paul Mackerras List of files: /linux/drivers/w1/Kconfig

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/w1/Kconfig

cbd32a1c56e36fedaa93a727699188bd3e6e6f67 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Mon, 12 Aug 2019 14:36:27 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentPull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM. List of files: /linux/drivers/w1/Kconfig