Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:1) Use after free in __dev_map_entry_free(), from Eric Dumazet.

 1) Use after free in __dev_map_entry_free(), from Eric Dumazet.

 2) Fix TCP retransmission timestamps on passive Fast Open, from Yuchung
    Cheng.

 3) Orphan NFC, we'll take the patches directly into my tree. From
    Johannes Berg.

 4) We can't recycle cloned TCP skbs, from Eric Dumazet.

 5) Some flow dissector bpf test fixes, from Stanislav Fomichev.

 6) Fix RCU marking and warnings in rhashtable, from Herbert Xu.

 7) Fix some potential fib6 leaks, from Eric Dumazet.

 8) Fix a _decode_session4 uninitialized memory read bug fix that got
    lost in a merge. From Florian Westphal.

 9) Fix ipv6 source address routing wrt. exception route entries, from
    Wei Wang.

10) The netdev_xmit_more() conversion was not done %100 properly in mlx5
    driver, fix from Tariq Toukan.

11) Clean up botched merge on netfilter kselftest, from Florian
    Westphal.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (74 commits)
  of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
  net: fix kernel-doc warnings for socket.c
  net: Treat sock->sk_drops as an unsigned int when printing
  kselftests: netfilter: fix leftover net/net-next merge conflict
  mlxsw: core: Prevent reading unsupported slave address from SFP EEPROM
  mlxsw: core: Prevent QSFP module initialization for old hardware
  vsock/virtio: Initialize core virtio vsock before registering the driver
  net/mlx5e: Fix possible modify header actions memory leak
  net/mlx5e: Fix no rewrite fields with the same match
  net/mlx5e: Additional check for flow destination comparison
  net/mlx5e: Add missing ethtool driver info for representors
  net/mlx5e: Fix number of vports for ingress ACL configuration
  net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
  net/mlx5e: Fix wrong xmit_more application
  net/mlx5: Fix peer pf disable hca command
  net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index
  net/mlx5: Add meaningful return codes to status_to_err function
  net/mlx5: Imply MLXFW in mlx5_core
  Revert "tipc: fix modprobe tipc failed after switch order of device registration"
  vsock/virtio: free packets during the socket release
  ...

diff --combined MAINTAINERS
index 5cfbea4ce57503cf29d9a156e2da917329dbcb57,43c7014829551e88197fe0a18a45fef9cc6a6b4e..0c55b0fedbe292a26f2d2095faa716deb6677913
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -742,12 -742,6 +742,12 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
 +M:    Talel Shenhar <talel@amazon.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
 +F:    drivers/thermal/thermal_mmio.c
 +
  AMAZON ETHERNET DRIVERS
  M:    Netanel Belgazal <netanel@amazon.com>
  R:    Saeed Bishara <saeedb@amazon.com>
@@@ -1000,7 -994,7 +1000,7 @@@ F:       include/linux/clk/analogbits
  ANDES ARCHITECTURE
  M:    Greentime Hu <green.hu@gmail.com>
  M:    Vincent Chen <deanbo422@gmail.com>
 -T:    git https://github.com/andestech/linux.git
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
  S:    Supported
  F:    arch/nds32/
  F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
@@@ -1733,21 -1727,11 +1733,21 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Maintained
  
  ARM/INTEL IXP4XX ARM ARCHITECTURE
 +M:    Linus Walleij <linusw@kernel.org>
  M:    Imre Kaloz <kaloz@openwrt.org>
  M:    Krzysztof Halasa <khalasa@piap.pl>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
 +F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/mach-ixp4xx/
 +F:    drivers/clocksource/timer-ixp4xx.c
 +F:    drivers/gpio/gpio-ixp4xx.c
 +F:    drivers/irqchip/irq-ixp4xx.c
 +F:    include/linux/irqchip/irq-ixp4xx.h
 +F:    include/linux/platform_data/timer-ixp4xx.h
  
  ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
  M:    Jonathan Cameron <jic23@cam.ac.uk>
@@@ -2043,7 -2027,7 +2043,7 @@@ W:      http://www.armlinux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
 -M:    Andy Gross <andy.gross@linaro.org>
 +M:    Andy Gross <agross@kernel.org>
  M:    David Brown <david.brown@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -2248,7 -2232,6 +2248,7 @@@ F:      arch/arm/mach-socfpga
  F:    arch/arm/boot/dts/socfpga*
  F:    arch/arm/configs/socfpga_defconfig
  F:    arch/arm64/boot/dts/altera/
 +F:    arch/arm64/boot/dts/intel/
  W:    http://www.rocketboards.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
@@@ -4150,9 -4133,7 +4150,9 @@@ F:      Documentation/admin-guide/pm/intel_p
  F:    Documentation/cpu-freq/
  F:    Documentation/devicetree/bindings/cpufreq/
  F:    drivers/cpufreq/
 +F:    kernel/sched/cpufreq*.c
  F:    include/linux/cpufreq.h
 +F:    include/linux/sched/cpufreq.h
  F:    tools/testing/selftests/cpufreq/
  
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
@@@ -4335,7 -4316,7 +4335,7 @@@ F:      drivers/infiniband/hw/cxgb3
  F:    include/uapi/rdma/cxgb3-abi.h
  
  CXGB4 CRYPTO DRIVER (chcr)
 -M:    Harsh Jain <harsh@chelsio.com>
 +M:    Atul Gupta <atul.gupta@chelsio.com>
  L:    linux-crypto@vger.kernel.org
  W:    http://www.chelsio.com
  S:    Supported
@@@ -8001,10 -7982,10 +8001,10 @@@ F:   Documentation/media/v4l-drivers/ipu3
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
 -F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
 -F:    arch/arm/mach-ixp4xx/include/mach/npe.h
 -F:    arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 -F:    arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +F:    include/linux/soc/ixp4xx/qmgr.h
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
  F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
  F:    drivers/net/wan/ixp4xx_hss.c
  
@@@ -8542,7 -8523,6 +8542,7 @@@ F:      scripts/Kbuild
  F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
 +F:    scripts/*vmlinux*
  F:    scripts/mod/
  F:    scripts/package/
  
@@@ -11068,10 -11048,8 +11068,8 @@@ S:  Supporte
  F:    drivers/net/ethernet/qlogic/netxen/
  
  NFC SUBSYSTEM
- M:    Samuel Ortiz <sameo@linux.intel.com>
- L:    linux-wireless@vger.kernel.org
- L:    linux-nfc@lists.01.org (subscribers-only)
- S:    Supported
+ L:    netdev@vger.kernel.org
+ S:    Orphan
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -15548,12 -15526,6 +15546,12 @@@ F: Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
  F:    drivers/clk/keystone/sci-clk.c
  F:    drivers/reset/reset-ti-sci.c
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
 +F:    drivers/irqchip/irq-ti-sci-intr.c
 +F:    drivers/irqchip/irq-ti-sci-inta.c
 +F:    include/linux/soc/ti/ti_sci_inta_msi.h
 +F:    drivers/soc/ti/ti_sci_inta_msi.c
  
  Texas Instruments ASoC drivers
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
@@@ -15672,7 -15644,7 +15670,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
 -M:    Kevin Hilman <khilman@kernel.org>
 +R:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported