summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cxgb4: Fix static checker warningHariprasad Shenai2015-06-061-1/+1
* Merge branch 'cxgb4-next'David S. Miller2015-06-065-51/+257
|\
| * cxgb4: Use FW LDST cmd to access TP_PIO_{ADDR, DATA} register firstHariprasad Shenai2015-06-062-21/+83
| * cxgb4: program pci completion timeoutHariprasad Shenai2015-06-061-0/+19
| * cxgb4: Set mac addr from vpd, when we can't contact firmwareHariprasad Shenai2015-06-063-19/+81
| * cxgb4: Rename t4_link_start() to t4_link_l1cfgHariprasad Shenai2015-06-064-6/+6
| * cxgb4: Add sge ec context flush serviceHariprasad Shenai2015-06-064-5/+33
| * cxgb4: Free Virtual Interfaces in remove routineHariprasad Shenai2015-06-063-0/+35
|/
* Merge branch 'mlx5-next'David S. Miller2015-06-0524-337/+1800
|\
| * mlx5: Enable mutual support for IB and EthernetHaggai Abramonvsky2015-06-055-2/+33
| * IB/mlx5: Don't create IB instance over Ethernet portsMajd Dibbiny2015-06-051-0/+4
| * IB/mlx5: Avoid using the MAD_IFC command under ISSI > 0 modeMajd Dibbiny2015-06-053-173/+657
| * net/mlx5_core: Add more query port helpersMajd Dibbiny2015-06-052-0/+75
| * net/mlx5_core: Use port number when querying port ptysMajd Dibbiny2015-06-053-6/+6
| * net/mlx5_core: Use port number in the query port mtu helpersMajd Dibbiny2015-06-053-10/+15
| * net/mlx5_core: Get vendor-id using the query adapter commandMajd Dibbiny2015-06-055-20/+53
| * net/mlx5_core: Add new query HCA vport commandsMajd Dibbiny2015-06-057-19/+349
| * net/mlx5_core: Make the vport helpers available for the IB driver tooMajd Dibbiny2015-06-054-5/+7
| * net/mlx5_core: Check the return bitmask when querying ISSIHaggai Abramonvsky2015-06-051-1/+1
| * net/mlx5_core: Enable XRCs and SRQs when using ISSI > 0Haggai Abramonvsky2015-06-057-73/+564
| * net/mlx5_core: Apply proper name convention to helpersHaggai Abramonvsky2015-06-053-30/+36
| * net/mlx5_en: Add missing check for memory allocation failureAmir Vadai2015-06-051-0/+2
|/
* Merge branch 'flow_key_hashing'David S. Miller2015-06-0512-135/+387
|\
| * mpls: Add MPLS entropy label in flow_keysTom Herbert2015-06-052-0/+36
| * net: Add GRE keyid in flow_keysTom Herbert2015-06-052-1/+29
| * net: Add IPv6 flow label to flow_keysTom Herbert2015-06-052-20/+13
| * net: Add VLAN ID to flow_keysTom Herbert2015-06-052-0/+20
| * net: Get rid of IPv6 hash addresses flow keysTom Herbert2015-06-052-18/+0
| * net: Add keys for TIPC addressTom Herbert2015-06-052-5/+23
| * net: Add full IPv6 addresses to flow_keysTom Herbert2015-06-0510-63/+193
| * net: Get skb hash over flow_keys structureTom Herbert2015-06-056-17/+66
| * net: Remove superfluous setting of key_basicTom Herbert2015-06-051-6/+0
| * mpls: Add definition for IPPROTO_MPLSTom Herbert2015-06-051-0/+2
| * net: Simplify GRE case in flow_dissectorTom Herbert2015-06-051-22/+22
|/
* atm:he - Do not initialise statics to 0.Shailendra Verma2015-06-051-1/+1
* bpf: fix build due to missing tc_verdAlexei Starovoitov2015-06-041-3/+1
* tcp: double default TSQ output bytes limitWei Liu2015-06-041-2/+2
* tcp: remove redundant checksEric Dumazet2015-06-042-4/+4
* Merge branch 'switchdev-next'David S. Miller2015-06-042-45/+54
|\
| * switchdev: documentation: use switchdev_port_obj_xxx for IPv4 FIB add/modify/...Scott Feldman2015-06-042-26/+31
| * switchdev: documentation: for static FDB ops, use switchdev_port_fdb_xxx opsScott Feldman2015-06-041-0/+4
| * switchdev: documentation: fix grammer errorScott Feldman2015-06-041-1/+1
| * switchdev: documentation: fix longer-than-80-char linesScott Feldman2015-06-041-18/+18
|/
* Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.or...David S. Miller2015-06-04155-3383/+13325
|\
| * Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of https://git.kernel.org/pub/s...Kalle Valo2015-06-0341-833/+1479
| |\
| | * iwlwifi: mvm: advertise only HW-supported ciphersJohannes Berg2015-06-032-7/+27
| | * iwlwifi: bump the iwlmvm API number to 15Emmanuel Grumbach2015-06-032-2/+2
| | * iwlwifi: mvm: Add DC2DC_CONFIG_CMD (0x83) cmd & TLVMatti Gottlieb2015-06-033-0/+49
| | * iwlwifi: mvm: Remove old scan commandsMatti Gottlieb2015-06-032-12/+0
| | * iwlwifi: prepare for higher API/CAPA bitsJohannes Berg2015-06-0314-116/+161