Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2018 22:13:42 +0000 (07:13 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2018 22:13:42 +0000 (07:13 +0900)
Pull networking fixes from David Miller:

 1) Fix crash on bpf_prog_load() errors, from Daniel Borkmann.

 2) Fix ATM VCC memory accounting, from David Woodhouse.

 3) fib6_info objects need RCU freeing, from Eric Dumazet.

 4) Fix SO_BINDTODEVICE handling for TCP sockets, from David Ahern.

 5) Fix clobbered error code in enic_open() failure path, from
    Govindarajulu Varadarajan.

 6) Propagate dev_get_valid_name() error returns properly, from Li
    RongQing.

 7) Fix suspend/resume in davinci_emac driver, from Bartosz Golaszewski.

 8) Various act_ife fixes (recursive locking, IDR leaks, etc.) from
    Davide Caratti.

 9) Fix buggy checksum handling in sungem driver, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
  ip: limit use of gso_size to udp
  stmmac: fix DMA channel hang in half-duplex mode
  net: stmmac: socfpga: add additional ocp reset line for Stratix10
  net: sungem: fix rx checksum support
  bpfilter: ignore binary files
  bpfilter: fix build error
  net/usb/drivers: Remove useless hrtimer_active check
  net/sched: act_ife: preserve the action control in case of error
  net/sched: act_ife: fix recursive lock and idr leak
  net: ethernet: fix suspend/resume in davinci_emac
  net: propagate dev_get_valid_name return code
  enic: do not overwrite error code
  net/tcp: Fix socket lookups with SO_BINDTODEVICE
  ptp: replace getnstimeofday64() with ktime_get_real_ts64()
  net/ipv6: respect rcu grace period before freeing fib6_info
  net: net_failover: fix typo in net_failover_slave_register()
  ipvlan: use ETH_MAX_MTU as max mtu
  net: hamradio: use eth_broadcast_addr
  enic: initialize enic->rfs_h.lock in enic_probe
  MAINTAINERS: Add Sam as the maintainer for NCSI
  ...

1  2 
MAINTAINERS

diff --combined MAINTAINERS
@@@ -1732,8 -1732,7 +1732,8 @@@ F:      arch/arm/mach-npcm
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
  F:    drivers/*/*npcm*
 -F:    Documentation/*/*npcm*
 +F:    Documentation/devicetree/bindings/*/*npcm*
 +F:    Documentation/devicetree/bindings/*/*/*npcm*
  
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
  M:    Wan ZongShun <mcuos.com@gmail.com>
@@@ -3080,7 -3079,7 +3080,7 @@@ M:      Clemens Ladisch <clemens@ladisch.de
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  T:    git git://git.alsa-project.org/alsa-kernel.git
  S:    Maintained
 -F:    Documentation/sound/alsa/Bt87x.txt
 +F:    Documentation/sound/cards/bt87x.rst
  F:    sound/pci/bt87x.c
  
  BT8XXGPIO DRIVER
@@@ -3376,7 -3375,7 +3376,7 @@@ M:      David Howells <dhowells@redhat.com
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    keyrings@vger.kernel.org
  S:    Maintained
 -F:    Documentation/module-signing.txt
 +F:    Documentation/admin-guide/module-signing.rst
  F:    certs/
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
@@@ -4360,7 -4359,12 +4360,7 @@@ L:     iommu@lists.linux-foundation.or
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  S:    Supported
 -F:    lib/dma-debug.c
 -F:    lib/dma-direct.c
 -F:    lib/dma-noncoherent.c
 -F:    lib/dma-virt.c
 -F:    drivers/base/dma-mapping.c
 -F:    drivers/base/dma-coherent.c
 +F:    kernel/dma/
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
@@@ -4509,7 -4513,7 +4509,7 @@@ DRM DRIVER FOR ILITEK ILI9225 PANEL
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/ili9225.c
 -F:    Documentation/devicetree/bindings/display/ili9225.txt
 +F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
  
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -4595,13 -4599,13 +4595,13 @@@ DRM DRIVER FOR SITRONIX ST7586 PANEL
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/st7586.c
 -F:    Documentation/devicetree/bindings/display/st7586.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7586.txt
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/st7735r.c
 -F:    Documentation/devicetree/bindings/display/st7735r.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
  
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -4634,6 -4638,7 +4634,6 @@@ F:      drivers/gpu/drm
  F:    drivers/gpu/vga/
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
 -F:    Documentation/devicetree/bindings/video/
  F:    Documentation/gpu/
  F:    include/drm/
  F:    include/uapi/drm/
@@@ -4678,7 -4683,7 +4678,7 @@@ M:      Boris Brezillon <boris.brezillon@boo
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
 -F:    Documentation/devicetree/bindings/drm/atmel/
 +F:    Documentation/devicetree/bindings/display/atmel/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR BRIDGE CHIPS
@@@ -4709,7 -4714,7 +4709,7 @@@ S:      Supporte
  F:    drivers/gpu/drm/fsl-dcu/
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
 -F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt
 +F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
  
  DRM DRIVERS FOR FREESCALE IMX
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -4819,7 -4824,7 +4819,7 @@@ M:      Eric Anholt <eric@anholt.net
  S:    Supported
  F:    drivers/gpu/drm/v3d/
  F:    include/uapi/drm/v3d_drm.h
 -F:    Documentation/devicetree/bindings/display/brcm,bcm-v3d.txt
 +F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR VC4
@@@ -5730,7 -5735,7 +5730,7 @@@ M:      Madalin Bucur <madalin.bucur@nxp.com
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/fman
 -F:    Documentation/devicetree/bindings/powerpc/fsl/fman.txt
 +F:    Documentation/devicetree/bindings/net/fsl-fman.txt
  
  FREESCALE QORIQ PTP CLOCK DRIVER
  M:    Yangbo Lu <yangbo.lu@nxp.com>
@@@ -6496,7 -6501,7 +6496,7 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    mm/hmm*
  F:    include/linux/hmm*
 -F:    Documentation/vm/hmm.txt
 +F:    Documentation/vm/hmm.rst
  
  HOST AP DRIVER
  M:    Jouni Malinen <j@w1.fi>
@@@ -6961,7 -6966,7 +6961,7 @@@ IIO MULTIPLEXE
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/multiplexer/iio-mux.txt
 +F:    Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
  F:    drivers/iio/multiplexer/iio-mux.c
  
  IIO SUBSYSTEM AND DRIVERS
@@@ -7396,7 -7401,7 +7396,7 @@@ F:      drivers/platform/x86/intel-wmi-thund
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  S:    Supported
 -F:    Documentation/trace/intel_th.txt
 +F:    Documentation/trace/intel_th.rst
  F:    drivers/hwtracing/intel_th/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
@@@ -7420,7 -7425,7 +7420,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  F:    drivers/iio/gyro/mpu3050*
 -F:    Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
 +F:    Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -8695,7 -8700,7 +8695,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    Documentation/hwmon/max6697
 -F:    Documentation/devicetree/bindings/i2c/max6697.txt
 +F:    Documentation/devicetree/bindings/hwmon/max6697.txt
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
@@@ -9075,7 -9080,7 +9075,7 @@@ M:      Martin Donnelly <martin.donnelly@ge.
  M:    Martyn Welch <martyn.welch@collabora.co.uk>
  S:    Maintained
  F:    drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
 -F:    Documentation/devicetree/bindings/video/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
 +F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
  
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@broadcom.com>
@@@ -9660,7 -9665,7 +9660,7 @@@ F:      include/uapi/linux/mmc
  MULTIPLEXER SUBSYSTEM
  M:    Peter Rosin <peda@axentia.se>
  S:    Maintained
 -F:    Documentation/ABI/testing/mux/sysfs-class-mux*
 +F:    Documentation/ABI/testing/sysfs-class-mux*
  F:    Documentation/devicetree/bindings/mux/
  F:    include/linux/dt-bindings/mux/
  F:    include/linux/mux/
@@@ -9691,7 -9696,7 +9691,7 @@@ MXSFB DRM DRIVE
  M:    Marek Vasut <marex@denx.de>
  S:    Supported
  F:    drivers/gpu/drm/mxsfb/
 -F:    Documentation/devicetree/bindings/display/mxsfb-drm.txt
 +F:    Documentation/devicetree/bindings/display/mxsfb.txt
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Chris Lee <christopher.lee@cspi.com>
@@@ -9751,6 -9756,11 +9751,11 @@@ L:    linux-scsi@vger.kernel.or
  S:    Maintained
  F:    drivers/scsi/NCR_D700.*
  
+ NCSI LIBRARY:
+ M:    Samuel Mendoza-Jonas <sam@mendozajonas.com>
+ S:    Maintained
+ F:    net/ncsi/
  NCT6775 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -10239,7 -10249,7 +10244,7 @@@ F:   arch/powerpc/include/asm/pnv-ocxl.
  F:    drivers/misc/ocxl/
  F:    include/misc/ocxl*
  F:    include/uapi/misc/ocxl.h
 -F:    Documentation/accelerators/ocxl.txt
 +F:    Documentation/accelerators/ocxl.rst
  
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
@@@ -10268,16 -10278,18 +10273,16 @@@ F:        arch/arm/boot/dts/*am5
  F:    arch/arm/boot/dts/*dra7*
  
  OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-omap@vger.kernel.org
  L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/omap2/
  F:    Documentation/arm/OMAP/DSS
  
  OMAP FRAMEBUFFER SUPPORT
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-fbdev@vger.kernel.org
  L:    linux-omap@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
@@@ -10721,7 -10733,7 +10726,7 @@@ PARALLEL LCD/KEYPAD PANEL DRIVE
  M:    Willy Tarreau <willy@haproxy.com>
  M:    Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
  S:    Odd Fixes
 -F:    Documentation/misc-devices/lcd-panel-cgram.txt
 +F:    Documentation/auxdisplay/lcd-panel-cgram.txt
  F:    drivers/misc/panel.c
  
  PARALLEL PORT SUBSYSTEM
@@@ -10878,7 -10890,7 +10883,7 @@@ M:   Will Deacon <will.deacon@arm.com
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/controller-generic-pci.txt
 +F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/controller/pci-host-common.c
  F:    drivers/pci/controller/pci-host-generic.c
  
@@@ -11059,7 -11071,7 +11064,7 @@@ M:   Xiaowei Song <songxiaowei@hisilicon.
  M:    Binghui Wang <wangbinghui@hisilicon.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/pcie-kirin.txt
 +F:    Documentation/devicetree/bindings/pci/kirin-pcie.txt
  F:    drivers/pci/controller/dwc/pcie-kirin.c
  
  PCIE DRIVER FOR HISILICON STB
@@@ -12450,7 -12462,7 +12455,7 @@@ L:   linux-crypto@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/crypto/exynos-rng.c
 -F:    Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
 +F:    Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt
  
  SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
  M:    Ćukasz Stelmach <l.stelmach@samsung.com>
@@@ -13292,7 -13304,7 +13297,7 @@@ M:   Vinod Koul <vkoul@kernel.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Supported
 -F:    Documentation/sound/alsa/compress_offload.txt
 +F:    Documentation/sound/designs/compress-offload.rst
  F:    include/sound/compress_driver.h
  F:    include/uapi/sound/compress_*
  F:    sound/core/compress_offload.c
@@@ -13313,7 -13325,7 +13318,7 @@@ L:   alsa-devel@alsa-project.org (moderat
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  F:    Documentation/devicetree/bindings/sound/
 -F:    Documentation/sound/alsa/soc/
 +F:    Documentation/sound/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -13572,7 -13584,7 +13577,7 @@@ F:   drivers/*/stm32-*timer
  F:    drivers/pwm/pwm-stm32*
  F:    include/linux/*/stm32-*tim*
  F:    Documentation/ABI/testing/*timer-stm32
 -F:    Documentation/devicetree/bindings/*/stm32-*timer
 +F:    Documentation/devicetree/bindings/*/stm32-*timer*
  F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
  
  STMMAC ETHERNET DRIVER
@@@ -13643,7 -13655,7 +13648,7 @@@ M:   Konrad Rzeszutek Wilk <konrad.wilk@o
  L:    iommu@lists.linux-foundation.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
 -F:    lib/swiotlb.c
 +F:    kernel/dma/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  
@@@ -13795,7 -13807,7 +13800,7 @@@ SYSTEM TRACE MODULE CLAS
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
 -F:    Documentation/trace/stm.txt
 +F:    Documentation/trace/stm.rst
  F:    drivers/hwtracing/stm/
  F:    include/linux/stm.h
  F:    include/uapi/linux/stm.h
@@@ -14472,7 -14484,7 +14477,7 @@@ M:   Steven Rostedt <rostedt@goodmis.org
  M:    Ingo Molnar <mingo@redhat.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Maintained
 -F:    Documentation/trace/ftrace.txt
 +F:    Documentation/trace/ftrace.rst
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
  F:    include/*/ftrace.h
@@@ -14941,7 -14953,7 +14946,7 @@@ M:   Heikki Krogerus <heikki.krogerus@lin
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-typec
 -F:    Documentation/usb/typec.rst
 +F:    Documentation/driver-api/usb/typec.rst
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
@@@ -15570,13 -15582,6 +15575,13 @@@ S: Maintaine
  F:    Documentation/x86/
  F:    arch/x86/
  
 +X86 ENTRY CODE
 +M:    Andy Lutomirski <luto@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
 +S:    Maintained
 +F:    arch/x86/entry/
 +
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <tony.luck@intel.com>
  M:    Borislav Petkov <bp@alien8.de>
@@@ -15599,7 -15604,7 +15604,7 @@@ F:   drivers/platform/x86
  F:    drivers/platform/olpc/
  
  X86 VDSO
 -M:    Andy Lutomirski <luto@amacapital.net>
 +M:    Andy Lutomirski <luto@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
  S:    Maintained
@@@ -15777,7 -15782,7 +15782,7 @@@ YEALINK PHONE DRIVE
  M:    Henk Vergonet <Henk.Vergonet@gmail.com>
  L:    usbb2k-api-dev@nongnu.org
  S:    Maintained
 -F:    Documentation/input/yealink.rst
 +F:    Documentation/input/devices/yealink.rst
  F:    drivers/input/misc/yealink.*
  
  Z8530 DRIVER FOR AX.25