summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: ipv6: Use passed in table for nexthop lookupsDavid Ahern2016-04-271-2/+38
* taskstats: fix nl parsing in accounting/getdelays.cNicolas Dichtel2016-04-271-1/+4
* pch_gbe: fix bogus trylock conversionFlorian Westphal2016-04-261-1/+1
* Merge branch 'sh_eth-next'David S. Miller2016-04-262-5/+5
|\
| * sh_eth: rename ARSTR register bitSergei Shtylyov2016-04-262-4/+4
| * sh_eth: use EDMR_SRST_GETHER in sh_eth_check_reset()Sergei Shtylyov2016-04-261-1/+1
|/
* Merge branch 'mlx5-next'David S. Miller2016-04-2610-470/+1092
|\
| * net/mlx5e: Fix checksum handling for non-stripped vlan packetsSaeed Mahameed2016-04-264-12/+38
| * net/mlx5e: Add ethtool support for rxvlan-offload (vlan stripping)Gal Pressman2016-04-263-3/+78
| * net/mlx5e: Add ethtool support for dump module EEPROMGal Pressman2016-04-264-1/+173
| * net/mlx5e: Add ethtool support for interface identify (LED blinking)Gal Pressman2016-04-264-0/+45
| * net/mlx5e: Add support for RXALL netdev featureEran Ben Elisha2016-04-264-0/+74
| * net/mlx5e: Improve set features ndo resiliencyGal Pressman2016-04-261-28/+82
| * net/mlx5e: Add link down events counterGal Pressman2016-04-263-1/+15
| * net/mlx5e: Add per priority group to PPort countersGal Pressman2016-04-264-4/+93
| * net/mlx5e: Rename VPort countersGal Pressman2016-04-261-16/+19
| * net/mlx5e: Statistics handling refactoringGal Pressman2016-04-265-440/+483
| * net/mlx5e: Report additional error statistics in get stats ndoGal Pressman2016-04-261-6/+33
|/
* infiniband: nes: Kill unused variable in nes_netdev_start_xmit()David S. Miller2016-04-261-1/+0
* Merge branch 'netdev_tx_locked-removal'David S. Miller2016-04-2621-121/+43
|\
| * net: remove NETDEV_TX_LOCKED supportFlorian Westphal2016-04-266-49/+9
| * drivers: net: remove NETDEV_TX_LOCKEDFlorian Westphal2016-04-265-26/+6
| * drivers: net: use NETDEV_TX_OK instead of NETDEV_TX_LOCKEDFlorian Westphal2016-04-265-13/+21
| * atle1: remove LLTX support and TX_UNLOCKEDFlorian Westphal2016-04-262-12/+1
| * atl1c: remove private tx lockFlorian Westphal2016-04-262-13/+1
| * RDMA/nes: remove use of NETDEV_TX_LOCKEDFlorian Westphal2016-04-261-8/+5
|/
* Merge branch 'get_phy_device-retval'David S. Miller2016-04-265-5/+5
|\
| * of_mdio: get_phy_device() doesn't return NULL anymoreSergei Shtylyov2016-04-261-1/+1
| * mdio_bus: get_phy_device() doesn't return NULL anymoreSergei Shtylyov2016-04-261-1/+1
| * fixed_phy: get_phy_device() doesn't return NULL anymoreSergei Shtylyov2016-04-261-1/+1
| * xgene: get_phy_device() doesn't return NULL anymoreSergei Shtylyov2016-04-261-1/+1
| * phylib: don't return NULL from get_phy_device()Sergei Shtylyov2016-04-261-1/+1
|/
* sh_eth: get rid of the 2nd parameter to sh_eth_dev_init()Sergei Shtylyov2016-04-261-14/+9
* sctp: sctp_diag should fill RMEM_ALLOC with asoc->rmem_alloc when rcvbuf_poli...Xin Long2016-04-261-1/+5
* macvtap: check minor when unregisteringFrancesco Ruggeri2016-04-261-0/+3
* macvlan: fix failure during registration v3Francesco Ruggeri2016-04-261-6/+4
* Merge branch 'qed-bandwidth-config'David S. Miller2016-04-267-62/+491
|\
| * qed: Add PF min bandwidth configuration supportManish Chopra2016-04-266-2/+104
| * qed: Add PF max bandwidth configuration supportManish Chopra2016-04-264-57/+165
| * qed: Add vport WFQ configuration APIsManish Chopra2016-04-265-4/+223
|/
* Merge branch 'cxgb4-next'David S. Miller2016-04-268-87/+281
|\
| * cxgb4: Decode link down reason code obtained from firmwareHariprasad Shenai2016-04-263-0/+40
| * cxgb4: Don't assume FW_PORT_CMD reply is always port info msgHariprasad Shenai2016-04-262-37/+74
| * cxgb4: DCB message handler needs to use correct portid to netdev mappingHariprasad Shenai2016-04-262-3/+4
| * cxgb4: Refactor t4_port_init functionHariprasad Shenai2016-04-262-40/+55
| * cxgb4: Properly decode port module typeHariprasad Shenai2016-04-261-0/+11
| * cxgb4: Avoids race and deadlock while freeing tx descriptorHariprasad Shenai2016-04-261-0/+2
| * cxgb4: Add llseek operation for flash debugfs entryHariprasad Shenai2016-04-261-0/+1
| * cxgb4: add new routine to get adapter infoHariprasad Shenai2016-04-264-8/+95
|/
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2016-04-2619-167/+356
|\