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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/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/nfc/nxp-nci/Kconfig

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/drivers/nfc/nxp-nci/Kconfig

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/nfc/nxp-nci/Kconfig

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/nfc/nxp-nci/Kconfig

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/nfc/nxp-nci/Kconfig

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/nfc/nxp-nci/Kconfig

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/nfc/nxp-nci/Kconfig