Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS updates from Richard Weinberger:
 "This contains cleanups and a maintainer update for UBI and UBIFS"

* tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs:
  ubifs: Remove unused header
  MAINTAINERS: Update UBIFS entry
  mtd: ubi: Add logging functions ubi_msg, ubi_warn and ubi_err
  ubifs: Add logging functions for ubifs_msg, ubifs_err and ubifs_warn

diff --combined MAINTAINERS
index 32bafda47c2fedacaf2f5b4a71347cc5889dc773,37f33abafcb7a4ebf9b46e20de1ac6b32ae8598b..cdee67fa9156cf45dcddacbcb23d321509426852
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -679,19 -679,11 +679,19 @@@ F:      drivers/gpu/drm/radeon/radeon_kfd.
  F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD SEATTLE DEVICE TREE SUPPORT
 +M:    Brijesh Singh <brijeshkumar.singh@amd.com>
 +M:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
 +M:    Tom Lendacky <thomas.lendacky@amd.com>
 +S:    Supported
 +F:    arch/arm64/boot/dts/amd/
 +
  AMD XGBE DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/amd/xgbe/
 +F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  
  AMS (Apple Motion Sensor) DRIVER
  M:    Michael Hanselmann <linux-kernel@hansmi.ch>
@@@ -847,12 -839,6 +847,12 @@@ S:       Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 +ARM HDLCD DRM DRIVER
 +M:    Liviu Dudau <liviu.dudau@arm.com>
 +S:    Supported
 +F:    drivers/gpu/drm/arm/
 +F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <spyro@f2s.com>
  S:    Maintained
@@@ -965,16 -951,6 +965,16 @@@ F:       arch/arm/boot/dts/alpine
  F:    arch/arm64/boot/dts/al/
  F:    drivers/*/*alpine*
  
 +ARM/ARTPEC MACHINE SUPPORT
 +M:    Jesper Nilsson <jesper.nilsson@axis.com>
 +M:    Lars Persson <lars.persson@axis.com>
 +M:    Niklas Cassel <niklas.cassel@axis.com>
 +S:    Maintained
 +L:    linux-arm-kernel@axis.com
 +F:    arch/arm/mach-artpec
 +F:    arch/arm/boot/dts/artpec6*
 +F:    drivers/clk/clk-artpec6.c
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@@ -1321,7 -1297,6 +1321,7 @@@ F:      arch/arm/mach-mvebu
  F:    drivers/rtc/rtc-armada38x.c
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
 +F:    arch/arm64/boot/dts/marvell/armada*
  
  
  ARM/Marvell Berlin SoC support
@@@ -1540,7 -1515,6 +1540,7 @@@ F:      arch/arm/mach-s5p*
  F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 +F:    drivers/soc/samsung/*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
  F:    Documentation/arm/Samsung/
@@@ -1838,13 -1812,11 +1838,13 @@@ F:   drivers/edac/synopsys_edac.
  
  ARM SMMU DRIVERS
  M:    Will Deacon <will.deacon@arm.com>
 +R:    Robin Murphy <robin.murphy@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
  F:    drivers/iommu/arm-smmu-v3.c
  F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm-v7s.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
@@@ -2434,9 -2406,8 +2434,9 @@@ F:      arch/arm/boot/dts/bcm470
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org
 -T:    git git://github.com/broadcom/arm-bcm63xx.git
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    bcm-kernel-feedback-list@broadcom.com
 +T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
@@@ -2569,13 -2540,6 +2569,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
 +BROADCOM VULCAN ARM64 SOC
 +M:    Jayachandran C. <jchandra@broadcom.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    bcm-kernel-feedback-list@broadcom.com
 +S:    Maintained
 +F:    arch/arm64/boot/dts/broadcom/vulcan*
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Anil Gurumurthy <anil.gurumurthy@qlogic.com>
  M:    Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@@ -3762,7 -3726,7 +3762,7 @@@ F:      drivers/gpu/vga
  F:    include/drm/
  F:    include/uapi/drm/
  
 -RADEON DRM DRIVERS
 +RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <alexander.deucher@amd.com>
  M:    Christian König <christian.koenig@amd.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -3770,8 -3734,6 +3770,8 @@@ T:      git git://people.freedesktop.org/~ag
  S:    Supported
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/radeon*
 +F:    drivers/gpu/drm/amd/
 +F:    include/uapi/drm/amdgpu*
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <thierry.reding@gmail.com>
@@@ -3816,7 -3778,7 +3816,7 @@@ F:      include/drm/exynos
  F:    include/uapi/drm/exynos*
  
  DRM DRIVERS FOR FREESCALE DCU
 -M:    Jianwei Wang <jianwei.wang.chn@gmail.com>
 +M:    Stefan Agner <stefan@agner.ch>
  M:    Alison Wang <alison.wang@freescale.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
@@@ -4364,12 -4326,6 +4364,12 @@@ L:    dri-devel@lists.freedesktop.or
  S:    Maintained
  F:    drivers/gpu/drm/exynos/exynos_dp*
  
 +EXYNOS SYSMMU (IOMMU) driver
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +L:    iommu@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/iommu/exynos-iommu.c
 +
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <inki.dae@samsung.com>
  M:    Donghwa Lee <dh09.lee@samsung.com>
@@@ -5270,16 -5226,6 +5270,16 @@@ F:    include/linux/hyperv.
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 +I2C MUXES
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/i2c/muxes/
 +F:    Documentation/devicetree/bindings/i2c/i2c-mux*
 +F:    drivers/i2c/i2c-mux.c
 +F:    drivers/i2c/muxes/
 +F:    include/linux/i2c-mux.h
 +
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
@@@ -5770,16 -5716,6 +5770,16 @@@ F:    Documentation/networking/i40evf.tx
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  
 +INTEL RDMA RNIC DRIVER
 +M:     Faisal Latif <faisal.latif@intel.com>
 +R:     Chien Tin Tung <chien.tin.tung@intel.com>
 +R:     Mustafa Ismail <mustafa.ismail@intel.com>
 +R:     Shiraz Saleem <shiraz.saleem@intel.com>
 +R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>
 +L:     linux-rdma@vger.kernel.org
 +S:     Supported
 +F:     drivers/infiniband/hw/i40iw/
 +
  INTEL-MID GPIO DRIVER
  M:    David Cohen <david.a.cohen@linux.intel.com>
  L:    linux-gpio@vger.kernel.org
@@@ -7901,11 -7837,6 +7901,11 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Maintained
  F:    sound/soc/codecs/tfa9879*
  
 +OBJTOOL
 +M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +S:    Supported
 +F:    tools/objtool/
 +
  OMAP SUPPORT
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
@@@ -7956,7 -7887,7 +7956,7 @@@ S:      Maintaine
  F:    arch/arm/*omap*/*clock*
  
  OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    arch/arm/*omap*/*pm*
@@@ -8060,7 -7991,7 +8060,7 @@@ F:      arch/arm/*omap*/usb
  OMAP GPIO DRIVER
  M:    Grygorii Strashko <grygorii.strashko@ti.com>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@@ -9234,12 -9165,6 +9234,12 @@@ S:    Supporte
  F:    net/rds/
  F:    Documentation/networking/rds.txt
  
 +RDMAVT - RDMA verbs software
 +M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +F:    drivers/infiniband/sw/rdmavt
 +
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  M:    Josh Triplett <josh@joshtriplett.org>
@@@ -9702,9 -9627,9 +9702,9 @@@ F: Documentation/devicetree/bindings/ne
  F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
  
  SYNOPSYS DESIGNWARE I2C DRIVER
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  M:    Jarkko Nikula <jarkko.nikula@linux.intel.com>
 -M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Mika Westerberg <mika.westerberg@linux.intel.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-designware-*
@@@ -9870,12 -9795,10 +9870,12 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 +M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    linux-mmc@vger.kernel.org
 -S:    Orphan
 -F:    drivers/mmc/host/sdhci.*
 -F:    drivers/mmc/host/sdhci-pltfm.[ch]
 +T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci*
 +F:    include/linux/mmc/sdhci*
  
  SECURE COMPUTING
  M:    Kees Cook <keescook@chromium.org>
@@@ -10125,7 -10048,7 +10125,7 @@@ F:   arch/arm/mach-s3c24xx/bast-irq.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
@@@ -10327,7 -10250,7 +10327,7 @@@ F:   drivers/media/pci/solo6x10
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Shaohua Li <shli@kernel.org>
  L:    linux-raid@vger.kernel.org
 -T:    git git://neil.brown.name/md
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -11326,12 -11249,13 +11326,13 @@@ S:        Maintaine
  F:    drivers/scsi/u14-34f.c
  
  UBI FILE SYSTEM (UBIFS)
+ M:    Richard Weinberger <richard@nod.at>
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
- S:    Maintained
+ S:    Supported
  F:    Documentation/filesystems/ubifs.txt
  F:    fs/ubifs/