summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* error-injection: Separate error-injection from kprobeMasami Hiramatsu2018-01-1322-213/+317
* tracing/kprobe: bpf: Compare instruction pointer with original oneMasami Hiramatsu2018-01-132-15/+7
* tracing/kprobe: bpf: Check error injectable event is on function entryMasami Hiramatsu2018-01-137-32/+31
* bpf: simplify xdp_convert_ctx_access for xdp_rxq_infoJesper Dangaard Brouer2018-01-132-5/+4
* Merge branch 'hns3-add-some-new-features-and-fix-some-bugs'David S. Miller2018-01-127-87/+336
|\
| * net: hns3: check for NULL function pointer in hns3_nic_set_featuresJian Shen2018-01-121-2/+4
| * net: hns3: add feature check when feature changedJian Shen2018-01-121-12/+15
| * net: hns3: add int_gl_idx setup for TX and RX queuesFuyun Liang2018-01-123-0/+21
| * net: hns3: change the unit of GL value macroFuyun Liang2018-01-121-4/+4
| * net: hns3: remove unused GL setup functionFuyun Liang2018-01-121-12/+0
| * net: hns3: refactor GL update functionFuyun Liang2018-01-121-19/+16
| * net: hns3: refactor interrupt coalescing init functionFuyun Liang2018-01-121-9/+20
| * net: hns3: add ethtool_ops.set_coalesce support to PFFuyun Liang2018-01-123-4/+188
| * net: hns3: add ethtool_ops.get_coalesce support to PFFuyun Liang2018-01-123-0/+40
| * net: hns3: remove TSO config command from VF driverPeng Li2018-01-122-28/+0
| * net: hns3: add ethtool_ops.get_channels support for VFPeng Li2018-01-122-0/+31
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-1272-348/+778
|\
| * Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-clientLinus Torvalds2018-01-121-6/+12
| |\
| | * rbd: set max_segments to USHRT_MAXIlya Dryomov2018-01-091-1/+1
| | * rbd: reacquire lock should update lock owner client idFlorian Margaine2018-01-091-5/+11
| * | Merge tag 'gpio-v4.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...Linus Torvalds2018-01-121-12/+23
| |\ \
| | * | gpio: Add missing open drain/source handling to gpiod_set_value_cansleep()Geert Uytterhoeven2018-01-101-12/+23
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-01-111-1/+3
| |\ \
| | * | Fix a leak in socket(2) when we fail to allocate a file descriptor.Al Viro2018-01-111-1/+3
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-01-1137-131/+303
| |\ \ \
| | * | | ipv6: sr: fix TLVs not being copied using setsockoptMathieu Xhonneux2018-01-101-0/+9
| | * | | ipv6: fix possible mem leaks in ipv6_make_skb()Eric Dumazet2018-01-101-2/+3
| | * | | Merge branch 'mlxsw-couple-of-fixes'David S. Miller2018-01-103-4/+11
| | |\ \ \
| | | * | | mlxsw: spectrum_qdisc: Don't use variable array in mlxsw_sp_tclass_congestion...Jiri Pirko2018-01-101-3/+4
| | | * | | mlxsw: pci: Wait after reset before accessing HWYuval Mintz2018-01-102-1/+7
| | |/ / /
| | * | | nfp: always unmask aux interrupts at initJakub Kicinski2018-01-101-0/+2
| | * | | 8021q: fix a memory leak for VLAN 0 deviceCong Wang2018-01-101-6/+1
| | * | | Merge tag 'wireless-drivers-for-davem-2018-01-09' of git://git.kernel.org/pub...David S. Miller2018-01-105-28/+30
| | |\ \ \
| | | * \ \ Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/at...Kalle Valo2018-01-052-13/+16
| | | |\ \ \
| | | | * | | wcn36xx: Fix dynamic power savingLoic Poulain2018-01-042-13/+16
| | | * | | | iwlwifi: pcie: fix DMA memory mapping / unmappingEmmanuel Grumbach2018-01-053-15/+14
| | * | | | | of_mdio: avoid MDIO bus removal when a PHY is missingMadalin Bucur2018-01-101-2/+7
| | * | | | | caif_usb: use strlcpy() instead of strncpy()Xiongfeng Wang2018-01-101-3/+1
| | * | | | | doc: clarification about setting SO_ZEROCOPYKornilios Kourtis2018-01-101-0/+4
| | * | | | | net: gianfar_ptp: move set_fipers() to spinlock protecting areaYangbo Lu2018-01-101-2/+1
| | * | | | | Merge branch 'sctp-Some-sockopt-optlen-fixes'David S. Miller2018-01-101-7/+21
| | |\ \ \ \ \
| | | * | | | | sctp: make use of pre-calculated lenMarcelo Ricardo Leitner2018-01-101-6/+10
| | | * | | | | sctp: add a ceiling to optlen in some sockoptsMarcelo Ricardo Leitner2018-01-101-0/+10
| | | * | | | | sctp: GFP_ATOMIC is not needed in sctp_setsockopt_eventsMarcelo Ricardo Leitner2018-01-101-1/+1
| | |/ / / / /
| | * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2018-01-1011-50/+150
| | |\ \ \ \ \
| | | * | | | | bpf: introduce BPF_JIT_ALWAYS_ON configAlexei Starovoitov2018-01-096-8/+50
| | | * | | | | bpf: avoid false sharing of map refcount with max_entriesDaniel Borkmann2018-01-091-8/+16
| | | * | | | | bpf: prevent out-of-bounds speculationAlexei Starovoitov2018-01-093-11/+74
| | | * | | | | selftests/bpf: fix test_alignAlexei Starovoitov2018-01-071-21/+1
| | | * | | | | bpf: sockmap missing NULL psock checkJohn Fastabend2018-01-071-2/+9