summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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/+73
| * 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
| | * MIPS: xilfpga: Actually include FDT in fitImageAlexandre Belloni2018-05-151-0/+1
| | * MIPS: xilfpga: Stop generating useless dtb.oAlexandre Belloni2018-05-151-2/+0
| | * KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable"Colin Ian King2018-05-151-1/+1
| | * MIPS: ptrace: Expose FIR register through FP regsetMaciej W. Rozycki2018-05-151-2/+16
| | * MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770Paul Cercueil2018-05-151-3/+3
| | * MIPS: c-r4k: Fix data corruption related to cache coherenceNeilBrown2018-05-151-3/+6
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-05-2157-465/+1010
| |\ \
| | * | net: ip6_gre: fix tunnel metadata device sharing.William Tu2018-05-201-22/+79
| | * | cxgb4: fix offset in collecting TX rate limit infoRahul Lakkireddy2018-05-181-19/+9
| | * | net: sched: red: avoid hashing NULL childPaolo Abeni2018-05-182-4/+6
| | * | sock_diag: fix use-after-free read in __sk_freeEric Dumazet2018-05-181-1/+1
| | * | sh_eth: Change platform check to CONFIG_ARCH_RENESASGeert Uytterhoeven2018-05-181-1/+1
| | * | net: dsa: Do not register devlink for unused portsFlorian Fainelli2018-05-181-3/+6
| | * | net: Fix a bug in removing queues from XPS mapAmritha Nambiar2018-05-181-1/+1
| | * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2018-05-184-36/+98
| | |\ \
| | | * | bpf: fix truncated jump targets on heavy expansionsDaniel Borkmann2018-05-182-27/+84
| | | * | bpf: parse and verdict prog attach may race with bpf map updateJohn Fastabend2018-05-181-3/+3
| | | * | bpf: sockmap update rollback on error can incorrectly dec prog refcntJohn Fastabend2018-05-181-6/+6
| | | * | selftests/bpf: check return value of fopen in test_verifier.cJesper Dangaard Brouer2018-05-171-0/+5
| | * | | net: test tailroom before appending to linear skbWillem de Bruijn2018-05-172-2/+4
| | * | | Merge branch 'ip6_gre-Fixes-in-headroom-handling'David S. Miller2018-05-171-39/+145
| | |\ \ \ | | | |/ / | | |/| |
| | | * | net: ip6_gre: Fix ip6erspan hlen calculationPetr Machata2018-05-171-9/+65
| | | * | net: ip6_gre: Split up ip6gre_changelink()Petr Machata2018-05-171-9/+24
| | | * | net: ip6_gre: Split up ip6gre_newlink()Petr Machata2018-05-171-6/+18
| | | * | net: ip6_gre: Split up ip6gre_tnl_change()Petr Machata2018-05-171-2/+8
| | | * | net: ip6_gre: Split up ip6gre_tnl_link_config()Petr Machata2018-05-171-12/+26
| | | * | net: ip6_gre: Fix headroom request in ip6erspan_tunnel_xmit()Petr Machata2018-05-171-1/+1
| | | * | net: ip6_gre: Request headroom in __gre6_xmit()Petr Machata2018-05-171-0/+3
| | |/ /
| | * | erspan: fix invalid erspan version.William Tu2018-05-172-2/+7
| | * | Merge branch 'ibmvnic-Fix-bugs-and-memory-leaks'David S. Miller2018-05-171-11/+17
| | |\ \
| | | * | ibmvnic: Fix statistics buffers memory leakThomas Falcon2018-05-171-9/+15
| | | * | ibmvnic: Fix non-fatal firmware error resetThomas Falcon2018-05-171-2/+1
| | | * | ibmvnic: Free coherent DMA memory if FW map failedThomas Falcon2018-05-171-0/+1
| | |/ /