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

Pull 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

diff --cc Makefile
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kvm/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/staging/media/atomisp/Kconfig
index f75765cb0fc8fd86f11cc705f187b49476ba416b,ba2855f656b67d8b5de9847bde01c1cd6e8d9047..fea06cb0eb48f4194f67019123579545a2cf749d
--- 1/drivers/staging/media/atomisp/Kconfig
--- 2/drivers/staging/media/atomisp/Kconfig
+++ b/drivers/staging/media/atomisp/Kconfig
@@@ -12,10 -11,9 +12,10 @@@ menuconfig INTEL_ATOMIS
  config VIDEO_ATOMISP
        tristate "Intel Atom Image Signal Processor Driver"
        depends on VIDEO_V4L2 && INTEL_ATOMISP
 +      depends on PMIC_OPREGION
        select IOSF_MBI
        select VIDEOBUF_VMALLOC
-       ---help---
+       help
          Say Y here if your platform supports Intel Atom SoC
          camera imaging subsystem.
          To compile this driver as a module, choose M here: the

diff --cc drivers/staging/media/atomisp/i2c/Kconfig
index 69f325c9a724f7827668cec830dbd35d9fe359a0,96f33a4e54984ca50de3aff6a8afb3860d63ac52..7c7f0fc090b391ec11ceb5dc8cf316fba571998a
--- 1/drivers/staging/media/atomisp/i2c/Kconfig
--- 2/drivers/staging/media/atomisp/i2c/Kconfig
+++ b/drivers/staging/media/atomisp/i2c/Kconfig
@@@ -55,10 -54,10 +55,10 @@@ config VIDEO_ATOMISP_GC031
        tristate "GC0310 sensor support"
        depends on ACPI
        depends on I2C && VIDEO_V4L2
-       ---help---
+       help
          This is a Video4Linux2 sensor-level driver for the Galaxycore
          GC0310 0.3MP sensor.
 -       
 +
  config VIDEO_ATOMISP_OV2680
         tristate "Omnivision OV2680 sensor support"
        depends on ACPI

diff --cc drivers/staging/media/atomisp/i2c/ov5693/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc samples/Kconfig
Simple merge

diff --cc samples/Makefile
Simple merge

diff --cc scripts/Makefile.lib
Simple merge