summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nfp: abm: add initial active buffer management NIC skeletonJakub Kicinski2018-05-236-0/+155
* nfp: core: allow 4-byte aligned accesses to Memory UnitsJakub Kicinski2018-05-231-50/+44Star
* nfp: add shared buffer configurationJakub Kicinski2018-05-236-1/+294
* nfp: add support for per-PCI PF mailboxJakub Kicinski2018-05-233-0/+173
* nfp: move rtsym helpers to pf codeJakub Kicinski2018-05-233-48/+51
* Merge branch 'bpfilter'David S. Miller2018-05-2317-12/+503
|\
| * net: add skeleton of bpfilter kernel moduleAlexei Starovoitov2018-05-2313-0/+339
| * umh: introduce fork_usermode_blob() helperAlexei Starovoitov2018-05-234-12/+164
|/
* Merge branch 'qed-firmware-TLV'David S. Miller2018-05-2316-2/+2502
|\
| * qedi: Add get_generic_tlv_data handler.Manish Rangankar2018-05-231-0/+16
| * qedi: Add support for populating ethernet TLVs.Manish Rangankar2018-05-233-0/+191
| * qedf: Add get_generic_tlv_data handler.Chad Dupuis2018-05-232-0/+18
| * qedf: Add support for populating ethernet TLVs.Chad Dupuis2018-05-234-1/+104
| * qede: Add support for populating ethernet TLVs.Sudarsana Reddy Kalluru2018-05-231-0/+101
| * qed: Add driver infrastucture for handling mfw requests.Sudarsana Reddy Kalluru2018-05-234-1/+170
| * qed: Add support for processing iscsi tlv request.Sudarsana Reddy Kalluru2018-05-233-1/+170
| * qed: Add support for processing fcoe tlv request.Sudarsana Reddy Kalluru2018-05-233-1/+1024
| * qed: Add support for tlv request processing.Sudarsana Reddy Kalluru2018-05-236-1/+480
| * qed: Add MFW interfaces for TLV request support.Sudarsana Reddy Kalluru2018-05-231-0/+231
|/
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-05-222-199/+264
|\
| * i40e: use the more traditional 'i' loop variableJacob Keller2018-05-221-28/+28
| * i40e: add function doc headers for ethtool stats functionsJacob Keller2018-05-221-0/+38
| * i40e: update data pointer directly when copying to the bufferJacob Keller2018-05-221-59/+58Star
| * i40e: fold prefix strings directly into stat namesJacob Keller2018-05-221-68/+69
| * i40e: use WARN_ONCE to replace the commented BUG_ON size checkJacob Keller2018-05-221-2/+4
| * i40e: split i40e_get_strings() into smaller functionsJacob Keller2018-05-221-83/+100
| * i40e: always return all queue stat stringsJacob Keller2018-05-221-5/+17
| * i40e: always return VEB stat stringsJacob Keller2018-05-221-29/+23Star
| * i40e: free skb after clearing lock in ptp_stopJacob Keller2018-05-221-1/+3
* | Merge branch 'tcp-ECN-quickack'David S. Miller2018-05-221-11/+13
|\ \
| * | tcp: do not aggressively quick ack after ECN eventsEric Dumazet2018-05-221-2/+2
| * | tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_modeEric Dumazet2018-05-221-11/+13
|/ /
* | net: sched: don't disable bh when accessing action idrVlad Buslov2018-05-221-10/+10
* | Merge branch 'net-ipv6-Fix-route-append-and-replace-use-cases'David S. Miller2018-05-225-104/+743
|\ \ | |/ |/|
| * selftests: fib_tests: Add ipv4 route add append replace testsDavid Ahern2018-05-221-1/+278
| * selftests: fib_tests: Add ipv6 route add append replace testsDavid Ahern2018-05-221-1/+334
| * selftests: fib_tests: Add option to pause after each testDavid Ahern2018-05-221-0/+13
| * selftests: fib_tests: Add command line optionsDavid Ahern2018-05-221-13/+40
| * selftests: fib_tests: Add success-fail countsDavid Ahern2018-05-221-0/+7
| * net/ipv6: Simplify route replace and appending into multipath routeDavid Ahern2018-05-223-93/+73Star
| * mlxsw: spectrum_router: Add support for route appendDavid Ahern2018-05-221-0/+2
|/
* Merge branch 'TI-Ethernet-driver-warnings-fixes'David S. Miller2018-05-214-10/+11
|\
| * ti: ethernet: davinci: Fix cast to int warningsFlorian Fainelli2018-05-211-4/+4
| * net: ethernet: davinci_emac: Fix printing of base addressFlorian Fainelli2018-05-211-2/+2
| * net: ethernet: ti: cpsw: Fix cpsw_add_ch_strings() printk formatFlorian Fainelli2018-05-211-2/+2
| * net: ethernet: ti: cpts: Fix timestamp printFlorian Fainelli2018-05-211-1/+2
| * ti: ethernet: cpdma: Use correct format for genpool_*Florian Fainelli2018-05-211-1/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-05-21340-1831/+4334
|\
| * Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-05-217-15/+31
| |\
| | * MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRsMaciej W. Rozycki2018-05-152-4/+4