* commit 'c7f3673b32897465fee22a551cc071731dd7a5d7': (98 commits)
  bridge: port isolate
  bridge: only accept EAP locally
  lzma: de-bloat the lzma library used by jffs2
  hack: kernel: add generic image_cmdline hack to MIPS targets
  rfkill: add fake rfkill support
  kernel: prevent cryptomgr from pulling in useless extra dependencies for tests that are not run
  kernel: move regmap bloat out of the kernel image if it is only being used in modules
  kconfig: owrt specific dependencies
  hack: net: remove bogus netfilter dependencies
  use the openwrt lzma options for now
  kernel: fix linux/spi/spidev.h portability issues with musl
  linux-3.6: fix portability of some includes files in tools/ used on the host
  kernel: fix linux 4.9 host tools portability issues
  kernel: do not build modules.order
  build: add a hack for removing non-essential module info
  kernel: strip unnecessary symbol table information from kernel modules
  serial: do not accept sysrq characters via serial port
  libata: add ledtrig support
  usb: Remove annoying warning about bogus URB
  usb: Remove annoying warning about bogus URB
  ...

OpenWrt used a different version of the struct disk_comp_opts than the
mainline kernel. This was changed to the format the upstream kernel uses
some time ago for LEDE.
This patch should detect based on the compiler being used if this is a
OpenWrt or a LEDE based environment and use the Openwrt specific version or
the upstream version. This way it should be possible to use the kernel in
both environments.

When CONFIG_MTD_UBI_GLUEBI_ROOTFS_DEV was not set the structure disk_comp_opts was missing a ";" at the end.