summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-04-151451-32244/+55301
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-04-1512-138/+215
| |\
| | * fm10k: Bump driver version to 0.15.2Jeff Kirsher2015-04-151-1/+1
| | * fm10k: corrected VF multicast updateJeff Kirsher2015-04-151-2/+5
| | * fm10k: mbx_update_max_size does not drop all oversized messagesJeff Kirsher2015-04-151-3/+6
| | * fm10k: reset head instead of calling update_max_sizeJeff Kirsher2015-04-151-2/+16
| | * fm10k: renamed mbx_tx_dropped to mbx_tx_oversizedJeff Kirsher2015-04-151-1/+1
| | * fm10k: update xcast mode before synchronizing multicast addressesJeff Kirsher2015-04-151-11/+11
| | * fm10k: start service timer on probeJeff Kirsher2015-04-151-3/+6
| | * fm10k: fix function header commentJeff Kirsher2015-04-151-2/+1
| | * fm10k: comment next_vf_mbx flowJeff Kirsher2015-04-151-0/+11
| | * fm10k: don't handle mailbox events in iov_event path and always process mailboxJeff Kirsher2015-04-152-32/+5
| | * fm10k: use separate workqueue for fm10k driverJeff Kirsher2015-04-153-1/+16
| | * fm10k: Set PF queues to unlimited bandwidth during virtualizationJeff Kirsher2015-04-151-1/+2
| | * fm10k: expose tx_timeout_count as an ethtool statJeff Kirsher2015-04-151-0/+2
| | * fm10k: only increment tx_timeout_count in Tx hang pathJeff Kirsher2015-04-151-1/+0
| | * fm10k: remove extraneous "Reset interface" messageJeff Kirsher2015-04-151-1/+0
| | * fm10k: separate PF only stats so that VF does not display themJeff Kirsher2015-04-151-14/+37
| | * fm10k: use hw->mac.max_queues for statsJeff Kirsher2015-04-152-8/+12
| | * fm10k: only show actual queues, not the maximum in hardwareJeff Kirsher2015-04-151-2/+3
| | * fm10k: allow creation of VLAN on default vidJeff Kirsher2015-04-151-4/+4
| | * fm10k: fix unused warningsJeff Kirsher2015-04-157-37/+35
| | * fm10k: Add netconsole supportJeff Kirsher2015-04-153-0/+28
| | * fm10k: Have the VF get the default VLAN during initJeff Kirsher2015-04-151-1/+5
| | * fm10k: Correct spelling mistakeJeff Kirsher2015-04-151-2/+2
| | * fm10k: Remove redundant rx_errors in ethtoolJeff Kirsher2015-04-143-7/+4
| | * fm10k: Corrected an error in Tx statisticsJeff Kirsher2015-04-141-2/+2
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-04-1536-579/+739
| |\ \ | | |/ | |/|
| | * netfilter: nf_tables: get rid of the expression example codePablo Neira Ayuso2015-04-131-94/+0
| | * netfilter: nft_dynset: dynamic stateful expression instantiationPatrick McHardy2015-04-132-4/+52
| | * netfilter: nf_tables: add flag to indicate set contains expressionsPatrick McHardy2015-04-133-2/+11
| | * netfilter: nf_tables: mark stateful expressionsPatrick McHardy2015-04-133-0/+6
| | * netfilter: nf_tables: prepare for expressions associated to set elementsPatrick McHardy2015-04-133-0/+18
| | * netfilter: nf_tables: add helper functions for expression handlingPatrick McHardy2015-04-132-5/+64
| | * uapi: ebtables: don't include linux/if.hPablo Neira Ayuso2015-04-132-3/+2
| | * netfilter: nf_tables: variable sized set element keys / dataPatrick McHardy2015-04-135-19/+23
| | * netfilter: nf_tables: support variable sized data in nft_data_init()Patrick McHardy2015-04-135-17/+30
| | * netfilter: nf_tables: switch registers to 32 bit addressingPatrick McHardy2015-04-1316-48/+110
| | * netfilter: nf_tables: add register parsing/dumping helpersPatrick McHardy2015-04-1315-53/+68
| | * netfilter: nf_tables: convert sets to u32 data pointersPatrick McHardy2015-04-133-10/+8
| | * netfilter: nf_tables: kill nft_data_cmp()Patrick McHardy2015-04-134-15/+7
| | * netfilter: nf_tables: convert expressions to u32 register pointersPatrick McHardy2015-04-138-67/+63
| | * netfilter: nf_tables: use struct nft_verdict within struct nft_dataPatrick McHardy2015-04-132-22/+23
| | * netfilter: nf_tables: get rid of NFT_REG_VERDICT usagePatrick McHardy2015-04-1329-125/+146
| | * netfilter: nf_tables: introduce nft_validate_register_load()Patrick McHardy2015-04-1311-40/+62
| | * netfilter: nf_tables: kill nft_validate_output_register()Patrick McHardy2015-04-1311-77/+14
| | * netfilter: nft_lookup: use nft_validate_register_store() to validate typesPatrick McHardy2015-04-132-8/+8
| | * netfilter: nf_tables: rename nft_validate_data_load()Patrick McHardy2015-04-1310-30/+33
| | * netfilter: nf_tables: validate len in nft_validate_data_load()Patrick McHardy2015-04-1310-46/+97
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-1417-37/+85
| |\ \