summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bpf, verifier: further improve search pruningDaniel Borkmann2016-04-081-2/+7
* devlink: share user_ptr pointer for both devlink and devlink_portJiri Pirko2016-04-081-8/+13
* Merge branch 'mlxsw-next'David S. Miller2016-04-088-113/+114
|\
| * mlxsw: reg: Fix SBPM register nameJiri Pirko2016-04-081-2/+2
| * mlxsw: reg: Share direction enum between SBPR, SBCM, SBPMJiri Pirko2016-04-082-26/+17
| * mlxsw: Do not pass around driver_priv directlyJiri Pirko2016-04-084-24/+31
| * mlxsw: Pass mlxsw_core as a param of mlxsw_core_skb_transmit*Jiri Pirko2016-04-084-19/+9
| * mlxsw: Move devlink port registration into common core codeJiri Pirko2016-04-085-41/+55
| * devlink: remove implicit type set in port registerJiri Pirko2016-04-081-1/+0
|/
* Merge branch 'nfp-mtu-buffer-reconfig'David S. Miller2016-04-084-336/+627
|\
| * nfp: allow ring size reconfiguration at runtimeJakub Kicinski2016-04-083-21/+136
| * nfp: pass ring count as function parameterJakub Kicinski2016-04-081-9/+14
| * nfp: convert .ndo_change_mtu() to prepare/commit paradigmJakub Kicinski2016-04-081-6/+102
| * nfp: propagate list buffer size in struct rx_ringJakub Kicinski2016-04-082-8/+19
| * nfp: sync ring state during FW reconfigurationJakub Kicinski2016-04-081-29/+16
| * nfp: slice .ndo_open() and .ndo_stop() upJakub Kicinski2016-04-081-82/+136
| * nfp: move filling ring information to FW configJakub Kicinski2016-04-081-18/+32
| * nfp: preallocate RX buffers early in .ndo_openJakub Kicinski2016-04-081-23/+11
| * nfp: reorganize initial filling of RX ringsJakub Kicinski2016-04-081-41/+78
| * nfp: cleanup tx ring flush and rename to resetJakub Kicinski2016-04-081-44/+37
| * nfp: allocate ring SW structs dynamicallyJakub Kicinski2016-04-083-17/+37
| * nfp: make *x_ring_init do all the initJakub Kicinski2016-04-081-10/+18
| * nfp: break up nfp_net_{alloc|free}_ringsJakub Kicinski2016-04-081-79/+47
| * nfp: move link state interrupt request/free callsJakub Kicinski2016-04-081-11/+12
| * nfp: correct RX buffer length calculationJakub Kicinski2016-04-081-7/+1
|/
* Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2016-04-0814-106/+786
|\
| * ixgbe: Bump version numberMark Rustad2016-04-071-1/+1
| * ixgbe: Add KR backplane support for x550em_aMark Rustad2016-04-073-4/+18
| * ixgbe: Add support for SGMII backplane interfaceMark Rustad2016-04-073-0/+69
| * ixgbe: Add support for SFPs with retimerMark Rustad2016-04-074-2/+144
| * ixgbe: Introduce function to control MDIO speedMark Rustad2016-04-071-6/+21
| * ixgbe: Read and parse NW_MNG_IF_SEL registerMark Rustad2016-04-072-5/+37
| * ixgbe: Read and set instance idMark Rustad2016-04-072-0/+13
| * ixgbe: Use new methods for PHY accessMark Rustad2016-04-071-3/+64
| * ixgbe: Add support for x550em_a 10G MAC typeMark Rustad2016-04-0711-9/+311
| * ixgbe: Use method pointer to access IOSF devicesMark Rustad2016-04-072-14/+20
| * ixgbe: Add definitions for x550em_a 10G MACMark Rustad2016-04-071-4/+18
| * ixgbe: Add support for single-port X550 deviceMark Rustad2016-04-073-0/+4
| * ixgbe/ixgbevf: Add support for bulk free in Tx cleanup & cleanup boolean logicAlexander Duyck2016-04-072-8/+16
| * ixgbe: Take manageability semaphore for firmware commandsMark Rustad2016-04-071-11/+19
| * ixgbe: Clean up interface for firmware commandsMark Rustad2016-04-073-28/+28
| * ixgbe: Correct length check for round upMark Rustad2016-04-071-1/+1
| * ixgbe: Change the lan_id and func fields to a u8 to avoid castsMark Rustad2016-04-073-4/+4
| * ixgbe: Delete some unused register definitionsMark Rustad2016-04-071-8/+0
* | Merge branch 'bpf-tracepoints'David S. Miller2016-04-0721-69/+475
|\ \
| * | samples/bpf: add tracepoint vs kprobe performance testsAlexei Starovoitov2016-04-074-0/+244
| * | samples/bpf: tracepoint exampleAlexei Starovoitov2016-04-071-4/+22
| * | samples/bpf: add tracepoint support to bpf loaderAlexei Starovoitov2016-04-071-5/+21
| * | bpf: sanitize bpf tracepoint accessAlexei Starovoitov2016-04-075-1/+33
| * | bpf: support bpf_get_stackid() and bpf_perf_event_output() in tracepoint prog...Alexei Starovoitov2016-04-073-2/+43