summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net_sched: move tp->root allocation into fw_init()WANG Cong2015-03-061-10/+13
* net_sched: move tp->root allocation into route4_init()WANG Cong2015-03-061-7/+7
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-03-0616-66/+114
|\
| * i40e/i40evf: Version bumpSravanthi Tangeda2015-03-052-2/+2
| * i40e: don't spam the system logMitch A Williams2015-03-051-3/+0
| * i40e: move IRQ tracking setup into MSIX setupShannon Nelson2015-03-051-31/+29
| * i40e: Ioremap changesAnjali Singhai2015-03-052-2/+7
| * i40e/i40evf: Clean up some formatting and other thingsJesse Brandeburg2015-03-058-10/+2
| * i40e: Add AOC PHY types to case statementsCatherine Sullivan2015-03-052-0/+4
| * i40e: Fix ethtool offline testGreg Rose2015-03-051-0/+10
| * i40e: Reassign incorrect PHY type to fix a FW bugCatherine Sullivan2015-03-051-0/+4
| * i40e: fix XPS mask when resettingJesse Brandeburg2015-03-051-11/+11
| * i40e: use more portable sign extensionJesse Brandeburg2015-03-051-2/+2
| * i40e/i40evf: grab NVM devstarter version not image versionShannon Nelson2015-03-053-3/+4
| * i40e: Don't check operational or sync bit for App TLVNeerav Parikh2015-03-051-1/+1
| * i40e: during LED interaction ignore activity LED src modesMatt Jared2015-03-051-1/+34
| * i40e: Fix NPAR Tx Scheduler initGreg Rose2015-03-051-0/+4
* | mpls: using vzalloc requires including vmalloc.hStephen Rothwell2015-03-061-0/+1
* | Merge branch 'cxgb4-next'David S. Miller2015-03-053-54/+80
|\ \
| * | cxgb4: Try and provide an RDMA CIQ per cpuHariprasad Shenai2015-03-053-17/+46
| * | cxgb4: Move offload Rx queue allocation to separate functionHariprasad Shenai2015-03-051-38/+35
|/ /
* | bridge: Extend Proxy ARP design to allow optional rules for Wi-FiJouni Malinen2015-03-057-8/+22
* | ax25: Fix the build when CONFIG_INET is disabledkbuild test robot2015-03-051-1/+1
|/
* net: bcmgenet: simplify __bcmgenet_tx_reclaim()Petri Gynther2015-03-052-24/+22
* Merge branch 'fib_trie-next'David S. Miller2015-03-054-368/+433
|\
| * fib_trie: Prevent allocating tnode if bits is too big for size_tAlexander Duyck2015-03-051-3/+13
| * fib_trie: Update last spot w/ idx >> n->bits code and explanationAlexander Duyck2015-03-051-5/+13
| * fib_trie: Make fib_table rcu safeAlexander Duyck2015-03-054-52/+98
| * fib_trie: move leaf and tnode to occupy the same spot in the key vectorAlexander Duyck2015-03-051-24/+27
| * fib_trie: Update insert and delete to make use of tp from find_nodeAlexander Duyck2015-03-051-142/+95
| * fib_trie: Fib find node should return parentAlexander Duyck2015-03-051-18/+24
| * fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leafAlexander Duyck2015-03-051-96/+120
| * fib_trie: Only resize tnodes once instead of on each leaf removal in fib_tabl...Alexander Duyck2015-03-051-63/+78
|/
* Merge tag 'linux-can-next-for-4.1-20150304' of git://git.kernel.org/pub/scm/l...David S. Miller2015-03-041-81/+177
|\
| * bfin_can: Merge header file from arch dependent locationAaron Wu2015-03-041-1/+109
| * bfin_can: introduce ioremap to comply to archs with MMUAaron Wu2015-03-041-14/+8
| * bfin_can: rewrite the blackfin style of read/write to common onesAaron Wu2015-03-041-66/+60
* | mpls: rtm_mpls_policy[] can be staticWu Fengguang2015-03-041-1/+1
* | Merge branch 'be2net-next'David S. Miller2015-03-045-123/+285
|\ \
| * | be2net: implement .sriov_configure() PCI callbackVasundhara Volam2015-03-042-65/+107
| * | be2net: re-distribute SRIOV resources allowed by FWVasundhara Volam2015-03-044-38/+141
| * | be2net: avoid creating the non-RSS default RXQ if FW allows toVasundhara Volam2015-03-045-24/+41
|/ /
* | net: cadence: Remove Kconfig dependency on ARCHMichal Simek2015-03-041-2/+2
* | Merge branch 'sh_eth-next'David S. Miller2015-03-042-26/+256
|\ \
| * | sh_eth: Mitigate lost statistics updatesBen Hutchings2015-03-041-12/+25
| * | sh_eth: Optionally log RX and TX status for each completed descriptorBen Hutchings2015-03-041-0/+7
| * | sh_eth: Implement ethtool register dump operationsBen Hutchings2015-03-042-11/+195
| * | sh_eth: WARN on access to a register not implemented in a particular chipBen Hutchings2015-03-042-3/+27
| * | sh_eth: Implement multicast statistic based on the RFS8 status bitBen Hutchings2015-03-041-0/+2
|/ /
* | Merge branch 'basic-mpls-support'David S. Miller2015-03-0410-2/+1110
|\ \