summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'filter-next'David S. Miller2014-05-2310-268/+457
|\
| * net: filter: add test case for jump with holes and ret x variantsDaniel Borkmann2014-05-231-0/+94
| * net: filter: improve test case frameworkDaniel Borkmann2014-05-231-155/+233
| * net: filter: doc: add section for BPF test suiteDaniel Borkmann2014-05-231-0/+14
| * net: filter: let unattached filters use sock_fprog_kernDaniel Borkmann2014-05-239-17/+18
| * net: filter: remove DL macroDaniel Borkmann2014-05-232-97/+99
|/
* Merge branch 'inet_csums_part3'David S. Miller2014-05-2331-59/+86
|\
| * l2tp: Add support for zero IPv6 checksumsTom Herbert2014-05-234-2/+20
| * net: Make enabling of zero UDP6 csums more restrictiveTom Herbert2014-05-234-6/+48
| * net: Split sk_no_check into sk_no_check_{rx,tx}Tom Herbert2014-05-2313-27/+21
| * net: Eliminate no_check from protoswTom Herbert2014-05-2314-24/+0
| * sunrpc: Remove sk_no_check settingTom Herbert2014-05-231-3/+0
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-05-2324-294/+271
|\
| * i40e,igb,ixgbe: remove usless return statementsStephen Hemminger2014-05-234-10/+0
| * igb/ixgbe: remove return statements for void functionsJeff Kirsher2014-05-233-4/+0
| * ixgbe: add /* fallthrough */ comment to case statementsJacob Keller2014-05-231-0/+4
| * ixgbe: add space between operands to &Jacob Keller2014-05-231-1/+1
| * ixgbe: don't check NULL for debugfs_remove_recursiveJacob Keller2014-05-231-2/+1
| * ixgbe: add braces around else blockJacob Keller2014-05-231-2/+2
| * ixgbe: fix several concatenated strings to single lineJacob Keller2014-05-235-33/+19
| * ixgbe: fix checkpatch style of blank line after declarationJacob Keller2014-05-231-0/+2
| * ixgbe: fix function-like macro, remove semicolonJacob Keller2014-05-231-2/+2
| * ixgbe: clean up checkpatch warnings about CODE_INDENT and LEADING_SPACEJacob Keller2014-05-2317-241/+241
* | Merge branch 'mvneta-next'David S. Miller2014-05-233-78/+45
|\ \
| * | net: mvneta: Remove unneeded 'weigth' fieldEzequiel Garcia2014-05-231-6/+1
| * | net: mvmdio: Use devm_* API to simplify the codeEzequiel Garcia2014-05-231-12/+6
| * | net: mvneta: Change the number of default rx queues to oneEzequiel Garcia2014-05-231-1/+4
| * | net: mvneta: Use prepare/commit API to simplify MAC address settingEzequiel Garcia2014-05-231-12/+7
| * | net: mvneta: Clean-up mvneta_init()Ezequiel Garcia2014-05-231-25/+11
| * | net: mvneta: Check tx queue setup error in mvneta_change_mtu()Ezequiel Garcia2014-05-231-4/+8
| * | net: mvneta: Clean-up mvneta_tx_frag_process()Ezequiel Garcia2014-05-231-8/+4
| * | net: mv643xx_eth: Simplify mv643xx_eth_adjust_link()Ezequiel Garcia2014-05-231-10/+4
|/ /
* | lib/test_bpf.c: don't use gcc union shortcutAndrew Morton2014-05-231-52/+52
* | net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate t...Sucheta Chakraborty2014-05-2320-67/+156
* | hyperv: Add hash value into RNDIS Per-packet infoHaiyang Zhang2014-05-232-4/+18
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pshela...David S. Miller2014-05-236-463/+558
|\ \ | |/ |/|
| * openvswitch: Simplify genetlink code.Pravin B Shelar2014-05-221-95/+90
| * openvswitch: Minimize ovs_flow_cmd_new|set critical sections.Jarno Rajahalme2014-05-221-76/+116
| * openvswitch: Split ovs_flow_cmd_new_or_set().Jarno Rajahalme2014-05-221-44/+116
| * openvswitch: Minimize ovs_flow_cmd_del critical section.Jarno Rajahalme2014-05-221-25/+28
| * openvswitch: Reduce locking requirements.Jarno Rajahalme2014-05-221-25/+29
| * openvswitch: Fix ovs_flow_stats_get/clear RCU dereference.Jarno Rajahalme2014-05-222-7/+9
| * openvswitch: Fix typo.Jarno Rajahalme2014-05-221-1/+1
| * openvswitch: Minimize dp and vport critical sections.Jarno Rajahalme2014-05-221-108/+110
| * openvswitch: Make flow mask removal symmetric.Jarno Rajahalme2014-05-221-19/+25
| * openvswitch: Build flow cmd netlink reply only if needed.Jarno Rajahalme2014-05-221-22/+48
| * openvswitch: Clarify locking.Jarno Rajahalme2014-05-222-7/+9
| * openvswitch: Avoid assigning a NULL pointer to flow actions.Jarno Rajahalme2014-05-222-7/+11
| * openvswitch: Compact sw_flow_key.Jarno Rajahalme2014-05-223-123/+62
|/
* Merge branch 'mlx4-next'David S. Miller2014-05-225-23/+21
|\