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

Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/flexcan.c
index 3a370d8437b0a7699d4b3be80395725e4b56c3e5,0626dcfd1f3d83ceaad91968cffd65370189cfac..3cd371c94e83a597b7775f0dd98af244502a2790
--- 1/drivers/net/can/flexcan.c
--- 2/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -184,13 -184,12 +184,13 @@@
   * Below is some version info we got:
   *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-
   *                                Filter? connected?  Passive detection  ception in MB
-  *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no
+  *   MX25  FlexCAN2  03.00.00.00     no        no        no       no        no
   *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no
-  *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no
+  *   MX35  FlexCAN2  03.00.00.00     no        no        no       no        no
   *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no
   *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes
-  *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?
+  *   VF610 FlexCAN3  ?               no       yes        no      yes       yes?
 + * LS1021A FlexCAN2  03.00.04.00     no       yes        no       no       yes
   *
   * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
   */
@@@ -302,15 -297,10 +302,16 @@@ static const struct flexcan_devtype_dat
  
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
        .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
-               FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+               FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
+               FLEXCAN_QUIRK_BROKEN_PERR_STATE,
  };
  
 +static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
 +      .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
 +              FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
 +              FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
 +};
 +
  static const struct can_bittiming_const flexcan_bittiming_const = {
        .name = DRV_NAME,
        .tseg1_min = 4,

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/phy/micrel.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge