Changes in Kconfig

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

Tue, 15 Dec 2020 00:27:23 +0000

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

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

Wed, 18 Nov 2020 02:13:23 +0000

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

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 12:19:48 +0000

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

9e8238020c5beba64e7ffafbb7ea0fb02fe68270 - Merge branch 'next' into for-linus

Fri, 07 Aug 2020 23:41:01 +0000

Merge branch 'next' into for-linusPrepare input updates for 5.9 merge window. List of files: /linux/net/netlabel/Kconfig

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

Mon, 03 Aug 2020 06:10:08 +0000

Merge branch 'for-next' into for-linus List of files: /linux/net/netlabel/Kconfig

9b031c86506cef9acae45e61339fcf9deaabb793 - Merge branch 'elan-i2c' into next

Wed, 22 Jul 2020 02:02:33 +0000

Merge branch 'elan-i2c' into nextBring in update to Elan touchpad driver to support newer touchpads withhigher resolution. List of files: /linux/net/netlabel/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 10:07:51 +0000

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/net/netlabel/Kconfig

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

Tue, 30 Jun 2020 09:32:02 +0000

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

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

Mon, 29 Jun 2020 10:15:51 +0000

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/net/netlabel/Kconfig

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

Thu, 25 Jun 2020 15:05:03 +0000

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/net/netlabel/Kconfig

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

Wed, 17 Jun 2020 16:20:14 +0000

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/net/netlabel/Kconfig

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

Wed, 17 Jun 2020 11:39:12 +0000

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

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

Tue, 16 Jun 2020 16:25:03 +0000

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

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

Tue, 16 Jun 2020 11:31:47 +0000

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/net/netlabel/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 20:29:16 +0000

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/net/netlabel/Kconfig

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

Sat, 13 Jun 2020 16:50:22 +0000

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/net/netlabel/Kconfig

8440d4a75d90556cfb8fb3e244443f67381aafd6 - Merge branch 'dt/schema-cleanups' into dt/linus

Fri, 12 Jun 2020 15:57:00 +0000

Merge branch 'dt/schema-cleanups' into dt/linus List of files: /linux/net/netlabel/Kconfig

f77d26a9fc525286bcef3d4f98b52e17482cf49c - Merge branch 'x86/entry' into ras/core

Thu, 11 Jun 2020 13:17:57 +0000

Merge branch 'x86/entry' into ras/coreto fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific followup patches can be applied without creating a horrible merge conflictafterwards. List of files: /linux/net/netlabel/Kconfig

4263eb6880df8383fff0efb872278a99eb6142c8 - Merge branch 'fixes-v5.7' into fixes

Mon, 08 Jun 2020 17:14:49 +0000

Merge branch 'fixes-v5.7' into fixes List of files: /linux/net/netlabel/Kconfig

16ba7e312045cd5d32fba0156312b4303f200787 - Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus

Wed, 03 Jun 2020 20:23:52 +0000

Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus List of files: /linux/net/netlabel/Kconfig