Merge branch '2019-05-03-master-imports'

- Various btrfs fixes
- Various TI platform fixes
- Other fixes (cross build, taurus update, Kconfig help text)

diff --combined MAINTAINERS
index 2902d3e99914916cce5ea3da03d9e38b3c99fd4b,7552783561b4843e59f90c3e09f57270c3636cd5..5891fd08b6a700c967f74dc441089dcfbffb037f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -239,7 -239,6 +239,7 @@@ F: arch/arm/mach-rmobile
  ARM ROCKCHIP
  M:    Simon Glass <sjg@chromium.org>
  M:    Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
 +M:    Kever Yang <kever.yang@rock-chips.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-rockchip.git
  F:    arch/arm/include/asm/arch-rockchip/
@@@ -587,7 -586,7 +587,7 @@@ S: Maintaine
  F:    arch/mips/mach-jz47xx/
  
  MMC
- M:    Jaehoon Chung <jh80.chung@samsung.com>
+ M:    Peng Fan <peng.fan@nxp.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-mmc.git
  F:    drivers/mmc/

diff --combined arch/arm/dts/Makefile
index b69b154deeba849265c308fe2944af050911f758,27d82eaea9f167a5b36246399692ca23f02e2436..8e082f28403a8d9510719f6abc84abfef9ece75d
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -74,7 -74,6 +74,7 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3288-fennec.dtb \
        rk3288-firefly.dtb \
        rk3288-miqi.dtb \
 +      rk3399-orangepi.dtb \
        rk3288-phycore-rdk.dtb \
        rk3288-popmetal.dtb \
        rk3288-rock2-square.dtb \
@@@ -256,6 -255,7 +256,7 @@@ dtb-$(CONFIG_AM33XX) += 
        am335x-evmsk.dtb \
        am335x-bonegreen.dtb \
        am335x-icev2.dtb \
+       am335x-pocketbeagle.dtb \
        am335x-pxm50.dtb \
        am335x-rut.dtb \
        am335x-shc.dtb \

diff --combined doc/git-mailrc
index 081c54374b52299efc736720f6b0136d192fc775,7d0e8b5fec46bd719359843703d47d77ae8ed54e..a63b76befc5c8601748cae2b8e857a4bc81f8d5b
--- 1/doc/git-mailrc
--- 2/doc/git-mailrc
+++ b/doc/git-mailrc
@@@ -22,11 -22,11 +22,12 @@@ alias bmeng          Bin Meng <bmeng.cn
  alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
  alias dinh           Dinh Nguyen <dinguyen@kernel.org>
  alias hs             Heiko Schocher <hs@denx.de>
+ alias freenix        Peng Fan <peng.fan@nxp.com>
  alias iwamatsu       Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  alias jaehoon        Jaehoon Chung <jh80.chung@samsung.com>
  alias jagan          Jagan Teki <jagan@amarulasolutions.com>
  alias jhersh         Joe Hershberger <joe.hershberger@ni.com>
 +alias kevery         Kever Yang <kever.yang@rock-chips.com>
  alias lukma          Lukasz Majewski <lukma@denx.de>
  alias macpaul        Macpaul Lin <macpaul@andestech.com>
  alias marex          Marek Vasut <marex@denx.de>
@@@ -71,7 -71,7 +72,7 @@@ alias tegra2         tegr
  alias ti             uboot, trini
  alias uniphier       uboot, masahiro
  alias zynq           uboot, monstr
 -alias rockchip       uboot, sjg, Kever Yang <kever.yang@rock-chips.com>, ptomsich
 +alias rockchip       uboot, sjg, kevery, ptomsich
  
  alias m68k           uboot, alisonwang, angelo_ts
  alias coldfire       m68k
@@@ -111,7 -111,7 +112,7 @@@ alias kerneldoc      uboot, mare
  alias fdt            uboot, sjg
  alias i2c            uboot, hs
  alias kconfig        uboot, masahiro
- alias mmc            uboot, jaehoon
+ alias mmc            uboot, freenix
  alias nand           uboot
  alias net            uboot, jhersh
  alias phy            uboot, jhersh