Merge remote-tracking branch 'origin/core' into net/base
authorDong Aisheng <aisheng.dong@nxp.com>
Mon, 14 Dec 2020 05:09:36 +0000 (13:09 +0800)
committerDong Aisheng <aisheng.dong@nxp.com>
Mon, 14 Dec 2020 05:09:36 +0000 (13:09 +0800)
* origin/core: (6 commits)
  LF-2702 scripts: gcc-plugins: make GCC_PLUGINS not default to y
  ENGR00279980 ubi: attach: do not return -EINVAL if the mtd->numeraseregions is 1
  of: of_reserved_mem: Ensure cma reserved region not cross the low/high memory
  mm: Re-export ioremap_page_range
  drivers/base: add sysfs entries for suppliers and consumers
  ...


Trivial merge