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

Pull networking updates from David Miller:

 1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

 2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

 3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

 4) BPF now has a "random" opcode, from Chema Gonzalez.

 5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

 6) Support TCP fastopen over ipv6, from Daniel Lee.

 7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers.  From Ezequiel Garcia.

 8) Support software TSO in fec driver too, from Nimrod Andy.

 9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

13) Support busy polling in SCTP, from Neal Horman.

14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

15) Bridge promisc mode handling improvements from Vlad Yasevich.

16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
  rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
  tcp: fixing TLP's FIN recovery
  net: fec: Add software TSO support
  net: fec: Add Scatter/gather support
  net: fec: Increase buffer descriptor entry number
  net: fec: Factorize feature setting
  net: fec: Enable IP header hardware checksum
  net: fec: Factorize the .xmit transmit function
  bridge: fix compile error when compiling without IPv6 support
  bridge: fix smatch warning / potential null pointer dereference
  via-rhine: fix full-duplex with autoneg disable
  bnx2x: Enlarge the dorq threshold for VFs
  bnx2x: Check for UNDI in uncommon branch
  bnx2x: Fix 1G-baseT link
  bnx2x: Fix link for KR with swapped polarity lane
  sctp: Fix sk_ack_backlog wrap-around problem
  net/core: Add VF link state control policy
  net/fsl: xgmac_mdio is dependent on OF_MDIO
  net/fsl: Make xgmac_mdio read error message useful
  net_sched: drr: warn when qdisc is not work conserving
  ...

1 files changed, 22 insertions, 8 deletions

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 9e7d95dae2c7..41688229c570 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -65,7 +65,7 @@ config CAN_LEDS
 
 config CAN_AT91
         tristate "Atmel AT91 onchip CAN controller"
-        depends on ARM
+        depends on ARCH_AT91 || COMPILE_TEST
         ---help---
           This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
           and AT91SAM9X5 processors.
@@ -77,12 +77,6 @@ config CAN_TI_HECC
           Driver for TI HECC (High End CAN Controller) module found on many
           TI devices. The device specifications are available from www.ti.com
 
-config CAN_MCP251X
-        tristate "Microchip MCP251x SPI CAN controllers"
-        depends on SPI && HAS_DMA
-        ---help---
-          Driver for the Microchip MCP251x SPI CAN controllers.
-
 config CAN_BFIN
         depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x
         tristate "Analog Devices Blackfin on-chip CAN"
@@ -110,7 +104,7 @@ config CAN_FLEXCAN
 
 config PCH_CAN
         tristate "Intel EG20T PCH CAN controller"
-        depends on PCI
+        depends on PCI && (X86_32 || COMPILE_TEST)
         ---help---
           This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
           is an IOH for x86 embedded processor (Intel Atom E6xx series).
@@ -125,6 +119,24 @@ config CAN_GRCAN
           endian syntheses of the cores would need some modifications on
           the hardware level to work.
 
+config CAN_RCAR
+        tristate "Renesas R-Car CAN controller"
+        depends on ARM
+        ---help---
+          Say Y here if you want to use CAN controller found on Renesas R-Car
+          SoCs.
+
+          To compile this driver as a module, choose M here: the module will
+          be called rcar_can.
+
+config CAN_XILINXCAN
+        tristate "Xilinx CAN"
+        depends on ARCH_ZYNQ || MICROBLAZE || COMPILE_TEST
+        depends on COMMON_CLK && HAS_IOMEM
+        ---help---
+          Xilinx CAN driver. This driver supports both soft AXI CAN IP and
+          Zynq CANPS IP.
+
 source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"
@@ -133,6 +145,8 @@ source "drivers/net/can/c_can/Kconfig"
 
 source "drivers/net/can/cc770/Kconfig"
 
+source "drivers/net/can/spi/Kconfig"
+
 source "drivers/net/can/usb/Kconfig"
 
 source "drivers/net/can/softing/Kconfig"