summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-08-1219-71/+92
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-08-1111-39/+46
| |\
| | * xen/netfront: don't cache skb_shinfo()Juergen Gross2018-08-111-4/+4
| | * Merge branch 'cpsw-runtime-pm-fix'David S. Miller2018-08-112-15/+12
| | |\
| | | * net: ethernet: ti: cpsw: fix runtime_pm while add/kill vlanIvan Khoronzhuk2018-08-111-4/+7
| | | * net: ethernet: ti: cpsw: clear all entries when delete vidIvan Khoronzhuk2018-08-112-11/+5
| | |/
| | * Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2018-08-108-20/+30
| | |\
| | | * Merge branch 'bpf-fix-cpu-and-devmap-teardown'Daniel Borkmann2018-08-094-14/+21
| | | |\
| | | | * xdp: fix bug in devmap teardown code pathJesper Dangaard Brouer2018-08-091-5/+9
| | | | * samples/bpf: xdp_redirect_cpu adjustment to reproduce teardown race easierJesper Dangaard Brouer2018-08-092-3/+3
| | | | * xdp: fix bug in cpumap teardown code pathJesper Dangaard Brouer2018-08-091-6/+9
| | | |/
| | | * Merge branch 'sockmap-fixes'Alexei Starovoitov2018-08-082-4/+7
| | | |\
| | | | * bpf, sockmap: fix cork timeout for select due to epipeDaniel Borkmann2018-08-081-1/+1
| | | | * bpf, sockmap: fix leak in bpf_tcp_sendmsg wait for mem pathDaniel Borkmann2018-08-081-2/+5
| | | | * bpf, sockmap: fix bpf_tcp_sendmsg sock error handlingDaniel Borkmann2018-08-081-1/+1
| | | |/
| | | * bpf: btf: Change tools/lib/bpf/btf to LGPLMartin KaFai Lau2018-08-062-2/+2
| * | | zram: remove BD_CAP_SYNCHRONOUS_IO with writeback featureMinchan Kim2018-08-111-1/+14
| * | | mm/memory.c: check return value of ioremap_protjie@chenjie6@huwei.com2018-08-111-0/+3
| * | | lib/ubsan: remove null-pointer checksAndrey Ryabinin2018-08-114-17/+0
| * | | MAINTAINERS: GDB: update e-mail addressKieran Bingham2018-08-111-1/+1
| * | | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2018-08-101-13/+28
| |\ \ \ | | |/ / | |/| |
| | * | i2c: xlp9xx: Fix case where SSIF read transaction completes earlyGeorge Cherian2018-08-091-13/+28
* | | | Merge branch 'Remove-rtnl-lock-dependency-from-all-action-implementations'David S. Miller2018-08-1117-122/+214
|\ \ \ \
| * | | | net: sched: act_police: remove dependency on rtnl lockVlad Buslov2018-08-111-3/+6
| * | | | net: core: protect rate estimator statistics pointer with lockVlad Buslov2018-08-112-10/+15
| * | | | net: sched: act_mirred: remove dependency on rtnl lockVlad Buslov2018-08-111-27/+51
| * | | | net: sched: extend action ops with put_dev callbackVlad Buslov2018-08-113-1/+13
| * | | | net: sched: act_vlan: remove dependency on rtnl lockVlad Buslov2018-08-111-12/+15
| * | | | net: sched: act_tunnel_key: remove dependency on rtnl lockVlad Buslov2018-08-111-13/+13
| * | | | net: sched: act_skbmod: remove dependency on rtnl lockVlad Buslov2018-08-111-5/+9
| * | | | net: sched: act_simple: remove dependency on rtnl lockVlad Buslov2018-08-111-1/+5
| * | | | net: sched: act_sample: remove dependency on rtnl lockVlad Buslov2018-08-111-2/+10
| * | | | net: sched: act_pedit: remove dependency on rtnl lockVlad Buslov2018-08-111-20/+20
| * | | | net: sched: act_ipt: remove dependency on rtnl lockVlad Buslov2018-08-111-0/+3
| * | | | net: sched: act_ife: remove dependency on rtnl lockVlad Buslov2018-08-111-15/+25
| * | | | net: sched: act_gact: remove dependency on rtnl lockVlad Buslov2018-08-111-2/+8
| * | | | net: sched: act_csum: remove dependency on rtnl lockVlad Buslov2018-08-111-9/+15
| * | | | net: sched: act_bpf: remove dependency on rtnl lockVlad Buslov2018-08-111-3/+7
|/ / / /
* | | | Merge branch 'net-sctp-Avoid-allocating-high-order-memory-with-kmalloc'David S. Miller2018-08-119-105/+172
|\ \ \ \
| * | | | net/sctp: Replace in/out stream arrays with flex_arrayKonstantin Khorenko2018-08-112-26/+71
| * | | | net/sctp: Make wrappers for accessing in/out streamsKonstantin Khorenko2018-08-119-81/+103
|/ / / /
* | | | tc: Update README and add configKeara Leibovitz2018-08-112-5/+59
* | | | Merge branch 'l2tp-rework-pppol2tp-ioctl-handling'David S. Miller2018-08-117-199/+133
|\ \ \ \
| * | | | l2tp: let pppol2tp_ioctl() fallback to dev_ioctl()Guillaume Nault2018-08-111-1/+1
| * | | | l2tp: zero out stats in pppol2tp_copy_stats()Guillaume Nault2018-08-111-4/+3
| * | | | l2tp: remove pppol2tp_session_ioctl()Guillaume Nault2018-08-112-48/+4
| * | | | l2tp: remove pppol2tp_tunnel_ioctl()Guillaume Nault2018-08-111-79/+53
| * | | | l2tp: handle PPPIOC[GS]MRU and PPPIOC[GS]FLAGS in pppol2tp_ioctl()Guillaume Nault2018-08-111-29/+44
| * | | | l2tp: simplify pppol2tp_ioctl()Guillaume Nault2018-08-111-27/+6
| * | | | l2tp: split l2tp_session_get()Guillaume Nault2018-08-116-36/+36