Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 188d1f76 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/intel/e1000e/ethtool.c
	drivers/net/vmxnet3/vmxnet3_drv.c
	drivers/net/wireless/iwlwifi/dvm/tx.c
	net/ipv6/route.c

The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.

The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.

The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.

The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 577ae39d bf414b36

drivers/bcma/driver_chipcommon_nflash.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ int bcma_nflash_init(struct bcma_drv_cc *cc) 
	struct bcma_bus *bus = cc->core->bus;



	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&

	    cc->core->id.rev != 0x38) {

	    cc->core->id.rev != 38) {

		bcma_err(bus, "NAND flash on unsupported board!\n");

		return -ENOTSUPP;

	}

drivers/net/bonding/bond_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,7 @@ static ssize_t bonding_store_primary(struct device *d, 
		pr_info("%s: Setting primary slave to None.\n",

			bond->dev->name);

		bond->primary_slave = NULL;

		memset(bond->params.primary, 0, sizeof(bond->params.primary));

		bond_select_active_slave(bond);

		goto out;

	}

drivers/net/can/c_can/c_can.c

+5 −1
Original line number Diff line number Diff line
@@ -491,8 +491,12 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface, 


	priv->write_reg(priv, C_CAN_IFACE(MASK1_REG, iface),

			IFX_WRITE_LOW_16BIT(mask));



	/* According to C_CAN documentation, the reserved bit

	 * in IFx_MASK2 register is fixed 1

	 */

	priv->write_reg(priv, C_CAN_IFACE(MASK2_REG, iface),

			IFX_WRITE_HIGH_16BIT(mask));

			IFX_WRITE_HIGH_16BIT(mask) | BIT(13));



	priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),

			IFX_WRITE_LOW_16BIT(id));

drivers/net/ethernet/emulex/benet/be.h

+4 −4
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 


#define DRV_VER			"4.6.62.0u"

#define DRV_NAME		"be2net"

#define BE_NAME			"ServerEngines BladeEngine2 10Gbps NIC"

#define BE3_NAME		"ServerEngines BladeEngine3 10Gbps NIC"

#define OC_NAME			"Emulex OneConnect 10Gbps NIC"

#define BE_NAME			"Emulex BladeEngine2"

#define BE3_NAME		"Emulex BladeEngine3"

#define OC_NAME			"Emulex OneConnect"

#define OC_NAME_BE		OC_NAME	"(be3)"

#define OC_NAME_LANCER		OC_NAME "(Lancer)"

#define OC_NAME_SH		OC_NAME "(Skyhawk)"

#define DRV_DESC		"ServerEngines BladeEngine 10Gbps NIC Driver"

#define DRV_DESC		"Emulex OneConnect 10Gbps NIC Driver"



#define BE_VENDOR_ID 		0x19a2

#define EMULEX_VENDOR_ID	0x10df

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
MODULE_VERSION(DRV_VER);

MODULE_DEVICE_TABLE(pci, be_dev_ids);

MODULE_DESCRIPTION(DRV_DESC " " DRV_VER);

MODULE_AUTHOR("ServerEngines Corporation");

MODULE_AUTHOR("Emulex Corporation");

MODULE_LICENSE("GPL");



static unsigned int num_vfs;